diff options
author | Andrew Sidwell <andy@entai.co.uk> | 2008-06-26 18:19:49 +0000 |
---|---|---|
committer | Andrew Sidwell <andy@entai.co.uk> | 2008-06-26 18:19:49 +0000 |
commit | 17447f074c102bdac9fdf3e1e0308c1b2e9718b6 (patch) | |
tree | c057331a8d3da9da9f8b567beb0f7dd4df26ee12 /src/treebuilder/in_body.c | |
parent | 9acb291f49419a1ebe0235f6622ef4e2976f9f33 (diff) | |
download | libhubbub-17447f074c102bdac9fdf3e1e0308c1b2e9718b6.tar.gz libhubbub-17447f074c102bdac9fdf3e1e0308c1b2e9718b6.tar.bz2 |
Add namespace awareness right through the code, in preparation for handling foreign content properly.
svn path=/trunk/hubbub/; revision=4457
Diffstat (limited to 'src/treebuilder/in_body.c')
-rw-r--r-- | src/treebuilder/in_body.c | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/src/treebuilder/in_body.c b/src/treebuilder/in_body.c index 5196a7b..739e0c2 100644 --- a/src/treebuilder/in_body.c +++ b/src/treebuilder/in_body.c @@ -571,10 +571,12 @@ void process_dd_dt_li_in_body(hubbub_treebuilder *treebuilder, } do { + hubbub_ns ns; element_type otype; void *node; - if (!element_stack_pop(treebuilder, &otype, &node)) { + if (!element_stack_pop(treebuilder, &ns, + &otype, &node)) { /** \todo errors */ } @@ -846,6 +848,7 @@ void process_image_in_body(hubbub_treebuilder *treebuilder, void process_input_in_body(hubbub_treebuilder *treebuilder, const hubbub_token *token) { + hubbub_ns ns; element_type otype; void *node; @@ -861,7 +864,7 @@ void process_input_in_body(hubbub_treebuilder *treebuilder, treebuilder->context.current_node].node); } - if (!element_stack_pop(treebuilder, &otype, &node)) { + if (!element_stack_pop(treebuilder, &ns, &otype, &node)) { /** \todo errors */ } @@ -1111,9 +1114,11 @@ void process_0container_in_body(hubbub_treebuilder *treebuilder, close_implied_end_tags(treebuilder, UNKNOWN); do { + hubbub_ns ns; void *node; - if (!element_stack_pop(treebuilder, &otype, &node)) { + if (!element_stack_pop(treebuilder, &ns, &otype, + &node)) { /** \todo errors */ } @@ -1144,11 +1149,12 @@ void process_0p_in_body(hubbub_treebuilder *treebuilder) /** \todo parse error */ } - while(element_in_scope(treebuilder, P, false)) { + while (element_in_scope(treebuilder, P, false)) { + hubbub_ns ns; element_type type; void *node; - if (!element_stack_pop(treebuilder, &type, &node)) { + if (!element_stack_pop(treebuilder, &ns, &type, &node)) { /** \todo errors */ } @@ -1195,9 +1201,10 @@ void process_0dd_dt_li_in_body(hubbub_treebuilder *treebuilder, close_implied_end_tags(treebuilder, type); do { + hubbub_ns ns; void *node; - if (!element_stack_pop(treebuilder, &otype, &node)) { + if (!element_stack_pop(treebuilder, &ns, &otype, &node)) { /** \todo errors */ } @@ -1239,9 +1246,11 @@ void process_0h_in_body(hubbub_treebuilder *treebuilder, close_implied_end_tags(treebuilder, UNKNOWN); do { + hubbub_ns ns; void *node; - if (!element_stack_pop(treebuilder, &otype, &node)) { + if (!element_stack_pop(treebuilder, &ns, &otype, + &node)) { /** \todo errors */ } @@ -1482,14 +1491,15 @@ bool aa_find_furthest_block(hubbub_treebuilder *treebuilder, } if (fb > treebuilder->context.current_node) { + hubbub_ns ns; element_type type; void *node; uint32_t index; - /* Pop all elements off the stack up to, + /* Pop all elements off the stack up to, * and including, the formatting element */ do { - if (!element_stack_pop(treebuilder, &type, &node)) { + if (!element_stack_pop(treebuilder, &ns, &type, &node)) { /** \todo errors */ } @@ -1811,9 +1821,11 @@ void process_0applet_button_marquee_object_in_body( close_implied_end_tags(treebuilder, UNKNOWN); do { + hubbub_ns ns; void *node; - if (!element_stack_pop(treebuilder, &otype, &node)) { + if (!element_stack_pop(treebuilder, &ns, &otype, + &node)) { /** \todo errors */ } @@ -1878,10 +1890,11 @@ void process_0generic_in_body(hubbub_treebuilder *treebuilder, close_implied_end_tags(treebuilder, UNKNOWN); do { + hubbub_ns ns; void *node; if (!element_stack_pop(treebuilder, - &otype, &node)) { + &ns, &otype, &node)) { /** \todo errors */ } |