From f42ed976e5e4c59b25250ad106527ac7b4447f68 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Mon, 14 Feb 2011 19:17:08 +0000 Subject: Constify svn path=/trunk/netsurf/; revision=11680 --- amiga/icon.c | 2 +- amiga/icon.h | 2 +- content/content.c | 8 ++++---- content/content.h | 4 ++-- desktop/browser.c | 2 +- desktop/browser.h | 2 +- desktop/scroll.c | 9 +++------ desktop/scroll.h | 4 ++-- image/bmp.c | 4 ++-- image/bmp.h | 4 ++-- image/gif.c | 4 ++-- image/gif.h | 4 ++-- image/ico.c | 4 ++-- image/ico.h | 4 ++-- image/jpeg.c | 4 ++-- image/jpeg.h | 4 ++-- image/mng.c | 4 ++-- image/mng.h | 4 ++-- image/nssprite.c | 2 +- image/nssprite.h | 2 +- image/png.c | 4 ++-- image/png.h | 4 ++-- image/rsvg.c | 2 +- image/rsvg.h | 6 +----- image/svg.c | 2 +- image/svg.h | 2 +- image/webp.c | 2 +- image/webp.h | 2 +- render/html.h | 4 ++-- render/html_redraw.c | 4 ++-- render/textplain.c | 2 +- render/textplain.h | 2 +- riscos/artworks.c | 2 +- riscos/artworks.h | 2 +- riscos/draw.c | 2 +- riscos/draw.h | 2 +- riscos/plugin.c | 2 +- riscos/plugin.h | 2 +- riscos/sprite.c | 2 +- riscos/sprite.h | 2 +- 40 files changed, 61 insertions(+), 68 deletions(-) diff --git a/amiga/icon.c b/amiga/icon.c index 711144de5..d31091489 100644 --- a/amiga/icon.c +++ b/amiga/icon.c @@ -188,7 +188,7 @@ void amiga_icon_destroy(struct content *c) */ bool amiga_icon_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { return plot.bitmap(x, y, width, height, diff --git a/amiga/icon.h b/amiga/icon.h index f7d9e6384..bd9fb501d 100644 --- a/amiga/icon.h +++ b/amiga/icon.h @@ -38,7 +38,7 @@ struct content_amiga_icon_data { bool amiga_icon_convert(struct content *c); void amiga_icon_destroy(struct content *c); bool amiga_icon_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool amiga_icon_clone(const struct content *old, struct content *new_content); diff --git a/content/content.c b/content/content.c index d3fc32388..60996f6a0 100644 --- a/content/content.c +++ b/content/content.c @@ -275,10 +275,10 @@ struct handler_entry { void (*mouse_action)(struct content *c, struct browser_window *bw, browser_mouse_state mouse, int x, int y); bool (*redraw)(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool (*redraw_tiled)(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y); void (*open)(struct content *c, struct browser_window *bw, @@ -901,7 +901,7 @@ void content_request_redraw(struct hlcache_handle *h, */ bool content_redraw(hlcache_handle *h, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { struct content *c = hlcache_handle_get_content(h); @@ -929,7 +929,7 @@ bool content_redraw(hlcache_handle *h, int x, int y, */ bool content_redraw_tiled(hlcache_handle *h, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y) { diff --git a/content/content.h b/content/content.h index 1abb40be6..c92fdd4a2 100644 --- a/content/content.h +++ b/content/content.h @@ -125,10 +125,10 @@ void content_mouse_track(struct hlcache_handle *h, struct browser_window *bw, void content_mouse_action(struct hlcache_handle *h, struct browser_window *bw, browser_mouse_state mouse, int x, int y); bool content_redraw(struct hlcache_handle *h, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool content_redraw_tiled(struct hlcache_handle *h, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y); void content_open(struct hlcache_handle *h, struct browser_window *bw, diff --git a/desktop/browser.c b/desktop/browser.c index b8a7818b0..36661f1de 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -90,7 +90,7 @@ static void browser_window_find_target_internal(struct browser_window *bw, /* exported interface, documented in browser.h */ bool browser_window_redraw(struct browser_window *bw, int x, int y, - struct rect *clip) + const struct rect *clip) { int width = 0; int height = 0; diff --git a/desktop/browser.h b/desktop/browser.h index 59b7d7393..c12f2113c 100644 --- a/desktop/browser.h +++ b/desktop/browser.h @@ -273,7 +273,7 @@ bool browser_window_stop_available(struct browser_window *bw); * Units for x, y and clip are pixels. */ bool browser_window_redraw(struct browser_window *bw, int x, int y, - struct rect *clip); + const struct rect *clip); /** * Check whether browser window is ready for redraw diff --git a/desktop/scroll.c b/desktop/scroll.c index 19efa8df5..5d7f179ba 100644 --- a/desktop/scroll.c +++ b/desktop/scroll.c @@ -196,15 +196,12 @@ static inline bool scroll_redraw_scrollbar_rectangle( * \param scroll the scroll to be redrawn * \param x the X coordinate to draw the scroll at * \param y the Y coordinate to draw the scroll at - * \param clip_x0 minimum x of the clipping rectangle - * \param clip_y0 minimum y of the clipping rectangle - * \param clip_x1 maximum x of the clipping rectangle - * \param clip_y1 maximum y of the clipping rectangle + * \param clip the clipping rectangle * \param scale scale for the redraw * \return true on succes false otherwise */ -bool scroll_redraw(struct scroll *scroll, int x, int y, struct rect *clip, - float scale) +bool scroll_redraw(struct scroll *scroll, int x, int y, + const struct rect *clip, float scale) { int w = SCROLLBAR_WIDTH; int well_length, bar_off, bar_c0, bar_c1; diff --git a/desktop/scroll.h b/desktop/scroll.h index ebca97463..e34ebba6b 100644 --- a/desktop/scroll.h +++ b/desktop/scroll.h @@ -64,8 +64,8 @@ bool scroll_create(bool horizontal, int length, void *client_data, scroll_client_callback client_callback, struct scroll **scroll_pt); void scroll_destroy(struct scroll *scroll); -bool scroll_redraw(struct scroll *scroll, int x, int y, struct rect *clip, - float scale); +bool scroll_redraw(struct scroll *scroll, int x, int y, + const struct rect *clip, float scale); void scroll_set(struct scroll *scroll, int scroll_val, bool bar); int scroll_get_offset(struct scroll *scroll); diff --git a/image/bmp.c b/image/bmp.c index b5487a3b8..f40cfb06c 100644 --- a/image/bmp.c +++ b/image/bmp.c @@ -117,7 +117,7 @@ bool nsbmp_convert(struct content *c) bool nsbmp_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { @@ -131,7 +131,7 @@ bool nsbmp_redraw(struct content *c, int x, int y, bool nsbmp_redraw_tiled(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y) { diff --git a/image/bmp.h b/image/bmp.h index b1d689d2a..cb386f6d1 100644 --- a/image/bmp.h +++ b/image/bmp.h @@ -46,10 +46,10 @@ bool nsbmp_create(struct content *c, const struct http_parameter *params); bool nsbmp_convert(struct content *c); void nsbmp_destroy(struct content *c); bool nsbmp_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool nsbmp_redraw_tiled(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y); bool nsbmp_clone(const struct content *old, struct content *new_content); diff --git a/image/gif.c b/image/gif.c index 8745942cd..94cba25f1 100644 --- a/image/gif.c +++ b/image/gif.c @@ -152,7 +152,7 @@ void nsgif_invalidate(void *bitmap, void *private_word) } bool nsgif_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { if (c->data.gif.current_frame != c->data.gif.gif->decoded_frame) @@ -167,7 +167,7 @@ bool nsgif_redraw(struct content *c, int x, int y, bool nsgif_redraw_tiled(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y) { diff --git a/image/gif.h b/image/gif.h index 27b2385cf..a9f16d489 100644 --- a/image/gif.h +++ b/image/gif.h @@ -43,10 +43,10 @@ bool nsgif_create(struct content *c, const struct http_parameter *params); bool nsgif_convert(struct content *c); void nsgif_destroy(struct content *c); bool nsgif_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool nsgif_redraw_tiled(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y); bool nsgif_clone(const struct content *old, struct content *new_content); diff --git a/image/ico.c b/image/ico.c index e1e3d2939..f147bad08 100644 --- a/image/ico.c +++ b/image/ico.c @@ -105,7 +105,7 @@ bool nsico_convert(struct content *c) } bool nsico_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { struct bmp_image *bmp = ico_find(c->data.ico.ico, width, height); @@ -139,7 +139,7 @@ bool nsico_set_bitmap_from_size(hlcache_handle *h, int width, int height) } bool nsico_redraw_tiled(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y) { diff --git a/image/ico.h b/image/ico.h index 16db54e94..666c22371 100644 --- a/image/ico.h +++ b/image/ico.h @@ -42,10 +42,10 @@ bool nsico_create(struct content *c, const struct http_parameter *params); bool nsico_convert(struct content *c); void nsico_destroy(struct content *c); bool nsico_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool nsico_redraw_tiled(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y); bool nsico_clone(const struct content *old, struct content *new_content); diff --git a/image/jpeg.c b/image/jpeg.c index f247243ea..4d7aa32f7 100644 --- a/image/jpeg.c +++ b/image/jpeg.c @@ -244,7 +244,7 @@ void nsjpeg_term_source(j_decompress_ptr cinfo) */ bool nsjpeg_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { return plot.bitmap(x, y, width, height, @@ -257,7 +257,7 @@ bool nsjpeg_redraw(struct content *c, int x, int y, */ bool nsjpeg_redraw_tiled(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y) { diff --git a/image/jpeg.h b/image/jpeg.h index c484ec890..70bae4a6b 100644 --- a/image/jpeg.h +++ b/image/jpeg.h @@ -39,10 +39,10 @@ struct content_jpeg_data { bool nsjpeg_convert(struct content *c); void nsjpeg_destroy(struct content *c); bool nsjpeg_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool nsjpeg_redraw_tiled(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y); bool nsjpeg_clone(const struct content *old, struct content *new_content); diff --git a/image/mng.c b/image/mng.c index d360b4c1a..4ebba304d 100644 --- a/image/mng.c +++ b/image/mng.c @@ -524,7 +524,7 @@ void nsmng_destroy(struct content *c) bool nsmng_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { bool ret; @@ -550,7 +550,7 @@ bool nsmng_redraw(struct content *c, int x, int y, bool nsmng_redraw_tiled(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y) { diff --git a/image/mng.h b/image/mng.h index eaf92968d..5835fef96 100644 --- a/image/mng.h +++ b/image/mng.h @@ -47,10 +47,10 @@ bool nsmng_process_data(struct content *c, const char *data, unsigned int size); bool nsmng_convert(struct content *c); void nsmng_destroy(struct content *c); bool nsmng_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool nsmng_redraw_tiled(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y); bool nsmng_clone(const struct content *old, struct content *new_content); diff --git a/image/nssprite.c b/image/nssprite.c index df1cdbe36..7bff6e0f7 100644 --- a/image/nssprite.c +++ b/image/nssprite.c @@ -136,7 +136,7 @@ void nssprite_destroy(struct content *c) */ bool nssprite_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { return plot.bitmap(x, y, width, height, diff --git a/image/nssprite.h b/image/nssprite.h index 800defd42..3b69108cd 100644 --- a/image/nssprite.h +++ b/image/nssprite.h @@ -38,7 +38,7 @@ struct content_nssprite_data { bool nssprite_convert(struct content *c); void nssprite_destroy(struct content *c); bool nssprite_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool nssprite_clone(const struct content *old, struct content *new_content); diff --git a/image/png.c b/image/png.c index 246b6d4ff..cbad15029 100644 --- a/image/png.c +++ b/image/png.c @@ -305,7 +305,7 @@ void nspng_destroy(struct content *c) bool nspng_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { assert(c->bitmap != NULL); @@ -315,7 +315,7 @@ bool nspng_redraw(struct content *c, int x, int y, } bool nspng_redraw_tiled(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y) { diff --git a/image/png.h b/image/png.h index 3e6e157be..fb9efcfd4 100644 --- a/image/png.h +++ b/image/png.h @@ -48,10 +48,10 @@ bool nspng_process_data(struct content *c, const char *data, unsigned int size); bool nspng_convert(struct content *c); void nspng_destroy(struct content *c); bool nspng_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool nspng_redraw_tiled(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour, bool repeat_x, bool repeat_y); bool nspng_clone(const struct content *old, struct content *new_content); diff --git a/image/rsvg.c b/image/rsvg.c index 31feb498f..7f88d82ad 100644 --- a/image/rsvg.c +++ b/image/rsvg.c @@ -181,7 +181,7 @@ bool rsvg_convert(struct content *c) } bool rsvg_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { plot.bitmap(x, y, width, height, c->bitmap, background_colour, BITMAPF_NONE); diff --git a/image/rsvg.h b/image/rsvg.h index 78a853c89..90b4ba8f3 100644 --- a/image/rsvg.h +++ b/image/rsvg.h @@ -48,12 +48,8 @@ bool rsvg_process_data(struct content *c, const char *data, unsigned int size); bool rsvg_convert(struct content *c); void rsvg_destroy(struct content *c); bool rsvg_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); -bool rsvg_redraw_tiled(struct content *c, int x, int y, - int width, int height, struct rect *clip, - float scale, colour background_colour, - bool repeat_x, bool repeat_y); bool rsvg_clone(const struct content *old, struct content *new_content); #endif /* WITH_RSVG */ diff --git a/image/svg.c b/image/svg.c index 26112b13c..43675faae 100644 --- a/image/svg.c +++ b/image/svg.c @@ -107,7 +107,7 @@ void svg_reformat(struct content *c, int width, int height) */ bool svg_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { float transform[6]; diff --git a/image/svg.h b/image/svg.h index 9ce8093e6..d836cb310 100644 --- a/image/svg.h +++ b/image/svg.h @@ -40,7 +40,7 @@ bool svg_convert(struct content *c); void svg_destroy(struct content *c); void svg_reformat(struct content *c, int width, int height); bool svg_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool svg_clone(const struct content *old, struct content *new_content); diff --git a/image/webp.c b/image/webp.c index 671ea5195..e4375637f 100644 --- a/image/webp.c +++ b/image/webp.c @@ -130,7 +130,7 @@ void webp_destroy(struct content *c) */ bool webp_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { return plot.bitmap(x, y, width, height, diff --git a/image/webp.h b/image/webp.h index acd449cbf..a89713ac3 100644 --- a/image/webp.h +++ b/image/webp.h @@ -38,7 +38,7 @@ struct content_webp_data { bool webp_convert(struct content *c); void webp_destroy(struct content *c); bool webp_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool webp_clone(const struct content *old, struct content *new_content); diff --git a/render/html.h b/render/html.h index 324e795f0..ee2f041bf 100644 --- a/render/html.h +++ b/render/html.h @@ -209,7 +209,7 @@ void html_redraw_a_box(struct hlcache_handle *h, struct box *box); /* in render/html_redraw.c */ bool html_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); /* in render/html_interaction.c */ @@ -228,7 +228,7 @@ bool text_redraw(const char *utf8_text, size_t utf8_len, size_t offset, bool space, const plot_font_style_t *fstyle, int x, int y, - struct rect *clip, + const struct rect *clip, int height, float scale, bool excluded); diff --git a/render/html_redraw.c b/render/html_redraw.c index 019b99ed7..8468d3007 100644 --- a/render/html_redraw.c +++ b/render/html_redraw.c @@ -110,7 +110,7 @@ bool html_redraw_debug = false; */ bool html_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { struct box *box; @@ -841,7 +841,7 @@ bool html_redraw_text_box(struct box *box, int x, int y, bool text_redraw(const char *utf8_text, size_t utf8_len, size_t offset, bool space, const plot_font_style_t *fstyle, - int x, int y, struct rect *clip, + int x, int y, const struct rect *clip, int height, float scale, bool excluded) diff --git a/render/textplain.c b/render/textplain.c index ada008f35..2a31c6272 100644 --- a/render/textplain.c +++ b/render/textplain.c @@ -546,7 +546,7 @@ void textplain_mouse_action(struct content *c, struct browser_window *bw, */ bool textplain_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { struct browser_window *bw = current_redraw_browser; diff --git a/render/textplain.h b/render/textplain.h index 284585e35..c338220d1 100644 --- a/render/textplain.h +++ b/render/textplain.h @@ -59,7 +59,7 @@ void textplain_mouse_action(struct content *c, struct browser_window *bw, void textplain_reformat(struct content *c, int width, int height); void textplain_destroy(struct content *c); bool textplain_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool textplain_clone(const struct content *old, struct content *new_content); diff --git a/riscos/artworks.c b/riscos/artworks.c index ecd3c3db2..318666bea 100644 --- a/riscos/artworks.c +++ b/riscos/artworks.c @@ -224,7 +224,7 @@ void artworks_destroy(struct content *c) */ bool artworks_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { static const ns_os_vdu_var_list vars = { diff --git a/riscos/artworks.h b/riscos/artworks.h index 8642f76a9..5acd463ee 100644 --- a/riscos/artworks.h +++ b/riscos/artworks.h @@ -42,7 +42,7 @@ struct content_artworks_data { bool artworks_convert(struct content *c); void artworks_destroy(struct content *c); bool artworks_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool artworks_clone(const struct content *old, struct content *new_content); diff --git a/riscos/draw.c b/riscos/draw.c index 4c2cfd409..b5c13d621 100644 --- a/riscos/draw.c +++ b/riscos/draw.c @@ -105,7 +105,7 @@ void draw_destroy(struct content *c) */ bool draw_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { os_trfm matrix; diff --git a/riscos/draw.h b/riscos/draw.h index 26c9ee08b..f7a014844 100644 --- a/riscos/draw.h +++ b/riscos/draw.h @@ -38,7 +38,7 @@ struct content_draw_data { bool draw_convert(struct content *c); void draw_destroy(struct content *c); bool draw_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool draw_clone(const struct content *old, struct content *new_content); diff --git a/riscos/plugin.c b/riscos/plugin.c index 71a0167a9..340eaaf3e 100644 --- a/riscos/plugin.c +++ b/riscos/plugin.c @@ -249,7 +249,7 @@ void plugin_destroy(struct content *c) * \param scale Scale of page (1.0 = 100%) */ bool plugin_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { /* do nothing */ diff --git a/riscos/plugin.h b/riscos/plugin.h index 290a00da3..d23e6539e 100644 --- a/riscos/plugin.h +++ b/riscos/plugin.h @@ -59,7 +59,7 @@ bool plugin_convert(struct content *c, int width, int height); void plugin_reformat(struct content *c, int width, int height); void plugin_destroy(struct content *c); bool plugin_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); void plugin_open(struct content *c, struct browser_window *bw, struct content *page, unsigned int index, struct box *box, diff --git a/riscos/sprite.c b/riscos/sprite.c index cc75b54cd..fbff2f885 100644 --- a/riscos/sprite.c +++ b/riscos/sprite.c @@ -112,7 +112,7 @@ void sprite_destroy(struct content *c) */ bool sprite_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour) { if (plot.flush && !plot.flush()) diff --git a/riscos/sprite.h b/riscos/sprite.h index 44cc029d8..a0b071425 100644 --- a/riscos/sprite.h +++ b/riscos/sprite.h @@ -38,7 +38,7 @@ struct content_sprite_data { bool sprite_convert(struct content *c); void sprite_destroy(struct content *c); bool sprite_redraw(struct content *c, int x, int y, - int width, int height, struct rect *clip, + int width, int height, const struct rect *clip, float scale, colour background_colour); bool sprite_clone(const struct content *old, struct content *new_content); #endif -- cgit v1.2.3