diff options
author | James Bursa <james@netsurf-browser.org> | 2004-06-02 21:09:14 +0000 |
---|---|---|
committer | James Bursa <james@netsurf-browser.org> | 2004-06-02 21:09:14 +0000 |
commit | ed4c1ad391d3c0cd8a0989653c7fe68b9501b019 (patch) | |
tree | 940f7137294e6bb4b588321010c37fcffa797a33 /render/html.c | |
parent | ef8e27a4586f3e213437ed8caadb6a8ee56a16d9 (diff) | |
download | netsurf-ed4c1ad391d3c0cd8a0989653c7fe68b9501b019.tar.gz netsurf-ed4c1ad391d3c0cd8a0989653c7fe68b9501b019.tar.bz2 |
[project @ 2004-06-02 21:09:14 by bursa]
Update calls to layout_document() for error handling.
svn path=/import/netsurf/; revision=915
Diffstat (limited to 'render/html.c')
-rw-r--r-- | render/html.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/render/html.c b/render/html.c index 4503e4d30..ab772e5d5 100644 --- a/render/html.c +++ b/render/html.c @@ -201,7 +201,8 @@ int html_convert(struct content *c, unsigned int width, unsigned int height) sprintf(c->status_message, messages_get("Formatting")); content_broadcast(c, CONTENT_MSG_STATUS, data); LOG(("Layout document")); - layout_document(c->data.html.layout->children, width); + layout_document(c->data.html.layout->children, width, + c->data.html.box_pool); /*box_dump(c->data.html.layout->children, 0);*/ c->width = c->data.html.layout->children->width; @@ -284,7 +285,7 @@ void html_find_stylesheets(struct content *c, xmlNode *head) c->data.html.stylesheet_content[0] = fetchcache( #ifdef riscos - "file:///%3CNetSurf$Dir%3E/Resources/CSS", + "file:/<NetSurf$Dir>/Resources/CSS", #else "file:///home/james/Projects/netsurf/CSS", #endif @@ -768,7 +769,8 @@ void html_revive(struct content *c, unsigned int width, unsigned int height) } } - layout_document(c->data.html.layout->children, width); + layout_document(c->data.html.layout->children, width, + c->data.html.box_pool); c->width = c->data.html.layout->children->width; c->height = c->data.html.layout->children->height; @@ -783,7 +785,8 @@ void html_revive(struct content *c, unsigned int width, unsigned int height) void html_reformat(struct content *c, unsigned int width, unsigned int height) { - layout_document(c->data.html.layout->children, width); + layout_document(c->data.html.layout->children, width, + c->data.html.box_pool); c->width = c->data.html.layout->children->width; c->height = c->data.html.layout->children->height; } |