From 270ef59a98d34fef418fb6cd27e46f3edc912948 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Sun, 28 Mar 2010 12:56:39 +0000 Subject: Merge jmb/new-cache; r=dsilvers,rs=vince svn path=/trunk/netsurf/; revision=10180 --- render/box_construct.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'render/box_construct.c') diff --git a/render/box_construct.c b/render/box_construct.c index bdab6159e..71d30ddae 100644 --- a/render/box_construct.c +++ b/render/box_construct.c @@ -35,7 +35,7 @@ #include #include #include "utils/config.h" -#include "content/content.h" +#include "content/content_protected.h" #include "css/css.h" #include "css/utils.h" #include "css/select.h" @@ -841,9 +841,9 @@ css_computed_style *box_get_style(struct content *c, if ((s = (char *) xmlGetProp(n, (const xmlChar *) "style"))) { inline_style = nscss_create_inline_style( (uint8_t *) s, strlen(s), - c->data.html.encoding, c->url, + c->data.html.encoding, content__get_url(c), c->data.html.quirks != BINDING_QUIRKS_MODE_NONE, - c->data.html.dict, myrealloc, c); + myrealloc, c); xmlFree(s); -- cgit v1.2.3