Fix up apple image content handler.

svn path=/trunk/netsurf/; revision=12540
This commit is contained in:
Michael Drake 2011-06-29 08:15:52 +00:00
parent 50bd90c84a
commit 673a51a0e5

View File

@ -41,10 +41,8 @@ static nserror apple_image_create(const content_handler *handler,
bool quirks, struct content **c);
static bool apple_image_convert(struct content *c);
static void apple_image_destroy(struct content *c);
static bool apple_image_redraw(struct content *c, int x, int y,
int width, int height, const struct rect *clip,
float scale, colour background_colour,
bool repeat_x, bool repeat_y);
static bool apple_image_redraw(struct content *c, struct content_redraw_data *data,
const struct rect *clip);
static nserror apple_image_clone(const struct content *old,
struct content **newc);
static content_type apple_image_content_type(lwc_string *mime_type);
@ -245,21 +243,18 @@ content_type apple_image_content_type(lwc_string *mime_type)
* Redraw a CONTENT_APPLE_IMAGE with appropriate tiling.
*/
bool apple_image_redraw(struct content *c, int x, int y,
int width, int height, const struct rect *clip,
float scale, colour background_colour,
bool repeat_x, bool repeat_y)
bool apple_image_redraw(struct content *c, struct content_redraw_data *data,
const struct rect *clip)
{
bitmap_flags_t flags = BITMAPF_NONE;
if (repeat_x)
if (data->repeat_x)
flags |= BITMAPF_REPEAT_X;
if (repeat_y)
if (data->repeat_y)
flags |= BITMAPF_REPEAT_Y;
return plot.bitmap(x, y, width, height,
c->bitmap, background_colour,
flags);
return plot.bitmap(data->x, data->y, data->width, data->height,
c->bitmap, data->background_colour, flags);
}
#endif /* WITH_APPLE_IMAGE */