diff options
author | Vincent Sanders <vince@netsurf-browser.org> | 2011-05-08 19:54:35 +0000 |
---|---|---|
committer | Vincent Sanders <vince@netsurf-browser.org> | 2011-05-08 19:54:35 +0000 |
commit | 8be1e85e919d5b6c12979dca0d57f7cd67d2cb79 (patch) | |
tree | c0887e7c26229de5f543b03eb9bdb8d5561e9787 /render | |
parent | 8f6c343309dd32c3193622961df5e2f785915665 (diff) | |
download | netsurf-8be1e85e919d5b6c12979dca0d57f7cd67d2cb79.tar.gz netsurf-8be1e85e919d5b6c12979dca0d57f7cd67d2cb79.tar.bz2 |
consolidate content redraw
more cleanups ready for image content refactor
svn path=/trunk/netsurf/; revision=12317
Diffstat (limited to 'render')
-rw-r--r-- | render/html.c | 1 | ||||
-rw-r--r-- | render/html_internal.h | 3 | ||||
-rw-r--r-- | render/html_redraw.c | 10 | ||||
-rw-r--r-- | render/textplain.c | 7 |
4 files changed, 12 insertions, 9 deletions
diff --git a/render/html.c b/render/html.c index 20ff41f5e..dd29d2c54 100644 --- a/render/html.c +++ b/render/html.c @@ -111,7 +111,6 @@ static const content_handler html_content_handler = { html_mouse_track, html_mouse_action, html_redraw, - NULL, html_open, html_close, html_clone, diff --git a/render/html_internal.h b/render/html_internal.h index ae1851e1e..dd04edb77 100644 --- a/render/html_internal.h +++ b/render/html_internal.h @@ -97,7 +97,8 @@ void html_set_status(html_content *c, const char *extra); /* in render/html_redraw.c */ bool html_redraw(struct content *c, int x, int y, int width, int height, const struct rect *clip, - float scale, colour background_colour); + float scale, colour background_colour, + bool repeat_x, bool repeat_y); /* in render/html_interaction.c */ void html_mouse_track(struct content *c, struct browser_window *bw, diff --git a/render/html_redraw.c b/render/html_redraw.c index fbe09f744..2d1a78559 100644 --- a/render/html_redraw.c +++ b/render/html_redraw.c @@ -113,7 +113,8 @@ bool html_redraw_debug = false; bool html_redraw(struct content *c, int x, int y, int width, int height, const struct rect *clip, - float scale, colour background_colour) + float scale, colour background_colour, + bool repeat_x, bool repeat_y) { html_content *html = (html_content *) c; struct box *box; @@ -655,7 +656,8 @@ bool html_redraw_box(struct box *box, int x_parent, int y_parent, x_scrolled + padding_left, y_scrolled + padding_top, width, height, &r, scale, - current_background_color)) + current_background_color, + false, false)) return false; } else if (box->gadget && box->gadget->type == GADGET_CHECKBOX) { @@ -2169,7 +2171,7 @@ bool html_redraw_background(int x, int y, struct box *box, float scale, if ((r.x0 < r.x1) && (r.y0 < r.y1)) { if (!plot.clip(&r)) return false; - if (!content_redraw_tiled( + if (!content_redraw( background->background, x, y, ceilf(width * scale), ceilf(height * scale), &r, @@ -2310,7 +2312,7 @@ bool html_redraw_inline_background(int x, int y, struct box *box, float scale, if ((r.x0 < r.x1) && (r.y0 < r.y1)) { if (!plot.clip(&r)) return false; - if (!content_redraw_tiled(box->background, x, y, + if (!content_redraw(box->background, x, y, ceilf(width * scale), ceilf(height * scale), &r, scale, *background_colour, diff --git a/render/textplain.c b/render/textplain.c index a394b8251..6ec2f2521 100644 --- a/render/textplain.c +++ b/render/textplain.c @@ -104,7 +104,8 @@ static void textplain_reformat(struct content *c, int width, int height); static void textplain_destroy(struct content *c); static bool textplain_redraw(struct content *c, int x, int y, int width, int height, const struct rect *clip, - float scale, colour background_colour); + float scale, colour background_colour, + bool redraw_x, bool redraw_y); static nserror textplain_clone(const struct content *old, struct content **newc); static content_type textplain_content_type(lwc_string *mime_type); @@ -131,7 +132,6 @@ static const content_handler textplain_content_handler = { textplain_redraw, NULL, NULL, - NULL, textplain_clone, NULL, textplain_content_type, @@ -687,7 +687,8 @@ 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, const struct rect *clip, - float scale, colour background_colour) + float scale, colour background_colour, + bool repeat_x, bool repeat_y) { textplain_content *text = (textplain_content *) c; struct browser_window *bw = current_redraw_browser; |