From 3128ecf2a5c94102e0e1659f947a345d36750afe Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Tue, 28 Jun 2011 20:17:39 +0000 Subject: Unify content_redraw params in content_redraw_data struct. Core and RISC OS content handlers updated. svn path=/trunk/netsurf/; revision=12529 --- desktop/browser.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'desktop/browser.c') diff --git a/desktop/browser.c b/desktop/browser.c index 95fff4d8b..fdd021369 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -100,6 +100,7 @@ bool browser_window_redraw(struct browser_window *bw, int x, int y, int height = 0; bool plot_ok = true; content_type content_type; + struct content_redraw_data data; if (bw == NULL) { LOG(("NULL browser window")); @@ -131,10 +132,20 @@ bool browser_window_redraw(struct browser_window *bw, int x, int y, plot_ok &= plot.rectangle(clip->x0, clip->y0, clip->x1, clip->y1, plot_style_fill_white); } + + /* Set up content redraw data */ + data.x = x; + data.y = y; + data.width = width; + data.height = height; + + data.background_colour = 0xFFFFFF; + data.scale = bw->scale; + data.repeat_x = false; + data.repeat_y = false; /* Render the content */ - plot_ok &= content_redraw(bw->current_content, x, y, width, height, - clip, bw->scale, 0xFFFFFF, false, false); + plot_ok &= content_redraw(bw->current_content, &data, clip); if (bw->browser_window_type != BROWSER_WINDOW_IFRAME && plot.option_knockout) -- cgit v1.2.3