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/box.h | |
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/box.h')
-rw-r--r-- | render/box.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/render/box.h b/render/box.h index e7c19ad6d..b5092728f 100644 --- a/render/box.h +++ b/render/box.h @@ -99,7 +99,7 @@ struct box; struct column; struct object_params; struct object_param; - +struct html_content; #define UNKNOWN_WIDTH INT_MAX #define UNKNOWN_MAX_WIDTH INT_MAX @@ -332,8 +332,8 @@ bool box_handle_scrollbars(struct browser_window *bw, struct box *box, bool box_vscrollbar_present(const struct box *box); bool box_hscrollbar_present(const struct box *box); -bool xml_to_box(xmlNode *n, struct content *c); +bool xml_to_box(xmlNode *n, struct html_content *c); -bool box_normalise_block(struct box *block, struct content *c); +bool box_normalise_block(struct box *block, struct html_content *c); #endif |