diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2009-04-15 11:02:53 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-04-15 11:02:53 +0000 |
| commit | b50dc50a2b25c7cc77843b25adc41575cfce7fd6 (patch) | |
| tree | 68d81123fda9d7df3aa15375e12ea034896a1c87 /src/treebuilder/in_frameset.c | |
| parent | 051158ffe97eb9b4a1a4b9b5ea719c7e38509200 (diff) | |
| download | libhubbub-b50dc50a2b25c7cc77843b25adc41575cfce7fd6.tar.gz libhubbub-b50dc50a2b25c7cc77843b25adc41575cfce7fd6.tar.bz2 | |
Manually merge r7070 into trunk
svn path=/trunk/hubbub/; revision=7082
Diffstat (limited to 'src/treebuilder/in_frameset.c')
| -rw-r--r-- | src/treebuilder/in_frameset.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/treebuilder/in_frameset.c b/src/treebuilder/in_frameset.c index 10d1a8f..928e4cc 100644 --- a/src/treebuilder/in_frameset.c +++ b/src/treebuilder/in_frameset.c @@ -28,13 +28,16 @@ hubbub_error handle_in_frameset(hubbub_treebuilder *treebuilder, switch (token->type) { case HUBBUB_TOKEN_CHARACTER: - if (process_characters_expect_whitespace(treebuilder, - token, true)) { - /** \todo parser error */ + err = process_characters_expect_whitespace(treebuilder, + token, true); + if (err == HUBBUB_REPROCESS) { + /** \todo parse error */ + /* Ignore the token */ + err = HUBBUB_OK; } break; case HUBBUB_TOKEN_COMMENT: - process_comment_append(treebuilder, token, + err = process_comment_append(treebuilder, token, treebuilder->context.element_stack[ treebuilder->context.current_node].node); break; @@ -47,11 +50,13 @@ hubbub_error handle_in_frameset(hubbub_treebuilder *treebuilder, &token->data.tag.name); if (type == HTML) { - handle_in_body(treebuilder, token); + err = handle_in_body(treebuilder, token); } else if (type == FRAMESET) { - insert_element(treebuilder, &token->data.tag, true); + err = insert_element(treebuilder, &token->data.tag, + true); } else if (type == FRAME) { - insert_element(treebuilder, &token->data.tag, false); + err = insert_element(treebuilder, &token->data.tag, + false); /** \todo ack sc flag */ } else if (type == NOFRAMES) { err = handle_in_head(treebuilder, token); @@ -66,6 +71,7 @@ hubbub_error handle_in_frameset(hubbub_treebuilder *treebuilder, &token->data.tag.name); if (type == FRAMESET) { + hubbub_error e; hubbub_ns ns; void *node; @@ -75,10 +81,8 @@ hubbub_error handle_in_frameset(hubbub_treebuilder *treebuilder, break; } - if (!element_stack_pop(treebuilder, &ns, &type, - &node)) { - /** \todo errors */ - } + e = element_stack_pop(treebuilder, &ns, &type, &node); + assert(e == HUBBUB_OK); treebuilder->tree_handler->unref_node( treebuilder->tree_handler->ctx, |