diff options
author | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2010-03-28 12:56:39 +0000 |
---|---|---|
committer | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2010-03-28 12:56:39 +0000 |
commit | 270ef59a98d34fef418fb6cd27e46f3edc912948 (patch) | |
tree | 9d363b42d441640e1d2dbff3ba548a2cdf8d67a9 /render/box_construct.c | |
parent | 21da4f5bdf74c6654730c32dfcc1c6b3d24da4b4 (diff) | |
download | netsurf-270ef59a98d34fef418fb6cd27e46f3edc912948.tar.gz netsurf-270ef59a98d34fef418fb6cd27e46f3edc912948.tar.bz2 |
Merge jmb/new-cache; r=dsilvers,rs=vince
svn path=/trunk/netsurf/; revision=10180
Diffstat (limited to 'render/box_construct.c')
-rw-r--r-- | render/box_construct.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 <libxml/HTMLparser.h> #include <libxml/parserInternals.h> #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); |