diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2011-05-06 20:40:09 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-05-06 20:40:09 +0000 |
commit | e71691bae890040b83cfd54a2d9a1097d5026866 (patch) | |
tree | 96b2680dc6559ca0ab88fa0b6a533c13b7c9487e /render/html_redraw.c | |
parent | e77b1a29550e4753f771848705975295a6ebe99e (diff) | |
download | netsurf-e71691bae890040b83cfd54a2d9a1097d5026866.tar.gz netsurf-e71691bae890040b83cfd54a2d9a1097d5026866.tar.bz2 |
Merge branches/jmb/content-factory to trunk
svn path=/trunk/netsurf/; revision=12283
Diffstat (limited to 'render/html_redraw.c')
-rw-r--r-- | render/html_redraw.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/render/html_redraw.c b/render/html_redraw.c index c5d20b26f..fbe09f744 100644 --- a/render/html_redraw.c +++ b/render/html_redraw.c @@ -47,6 +47,7 @@ #include "render/box.h" #include "render/font.h" #include "render/form.h" +#include "render/html_internal.h" #include "render/layout.h" #include "utils/log.h" #include "utils/messages.h" @@ -114,6 +115,7 @@ bool html_redraw(struct content *c, int x, int y, int width, int height, const struct rect *clip, float scale, colour background_colour) { + html_content *html = (html_content *) c; struct box *box; bool result = true; bool select, select_only; @@ -122,7 +124,7 @@ bool html_redraw(struct content *c, int x, int y, .fill_colour = background_colour, }; - box = c->data.html.layout; + box = html->layout; assert(box); /* The select menu needs special treating because, when opened, it @@ -145,9 +147,8 @@ bool html_redraw(struct content *c, int x, int y, /* clear to background colour */ result = plot.clip(clip); - if (c->data.html.background_colour != NS_TRANSPARENT) - pstyle_fill_bg.fill_colour = - c->data.html.background_colour; + if (html->background_colour != NS_TRANSPARENT) + pstyle_fill_bg.fill_colour = html->background_colour; result &= plot.rectangle(clip->x0, clip->y0, clip->x1, clip->y1, &pstyle_fill_bg); |