Author: takkaria Date: Mon Jun 30 07:02:44 2008 New Revision: 4478 URL: http://source.netsurf-browser.org?rev=4478&view=rev Log: Implement "in frameset" tree construction mode. Added: trunk/hubbub/src/treebuilder/in_frameset.c (with props) Modified: trunk/hubbub/src/treebuilder/Makefile trunk/hubbub/src/treebuilder/modes.h Modified: trunk/hubbub/src/treebuilder/Makefile URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/Makefile?r... ============================================================================== --- trunk/hubbub/src/treebuilder/Makefile (original) +++ trunk/hubbub/src/treebuilder/Makefile Mon Jun 30 07:02:44 2008 @@ -37,7 +37,8 @@ in_head_noscript.c after_head.c in_body.c \ in_caption.c in_column_group.c in_table_body.c in_row.c \ in_cell.c in_select.c in_select_in_table.c \ - in_foreign_content.c after_body.c after_after_body.c \ + in_foreign_content.c after_body.c in_frameset.c \ + after_after_body.c \ generic_rcdata.c script_collect.c # Append to sources for component Added: trunk/hubbub/src/treebuilder/in_frameset.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/in_framese... ============================================================================== --- trunk/hubbub/src/treebuilder/in_frameset.c (added) +++ trunk/hubbub/src/treebuilder/in_frameset.c Mon Jun 30 07:02:44 2008 @@ -1,0 +1,92 @@ +/* + * This file is part of Hubbub. + * Licensed under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + * Copyright 2008 Andrew Sidwell + */ + +#include <assert.h> +#include <string.h> + +#include "treebuilder/modes.h" +#include "treebuilder/internal.h" +#include "treebuilder/treebuilder.h" +#include "utils/utils.h" + + +/** + * Handle token in "in frameset" insertion mode + * + * \param treebuilder The treebuilder instance + * \param token The token to handle + * \return True to reprocess token, false otherwise + */ +bool handle_in_frameset(hubbub_treebuilder *treebuilder, + const hubbub_token *token) +{ + bool reprocess = false; + + switch (token->type) { + case HUBBUB_TOKEN_CHARACTER: + reprocess = process_characters_expect_whitespace(treebuilder, + token, true); + break; + case HUBBUB_TOKEN_COMMENT: + process_comment_append(treebuilder, token, + treebuilder->context.element_stack[ + treebuilder->context.current_node].node); + break; + case HUBBUB_TOKEN_DOCTYPE: + /** \todo parse error */ + break; + case HUBBUB_TOKEN_START_TAG: + { + element_type type = element_type_from_name(treebuilder, + &token->data.tag.name); + + if (type == HTML) { + process_tag_in_body(treebuilder, token); + } else if (type == FRAMESET) { + insert_element(treebuilder, &token->data.tag); + } else if (type == FRAME) { + insert_element_no_push(treebuilder, &token->data.tag); + /** \todo ack sc flag */ + } else if (type == NOFRAMES) { + process_in_head(treebuilder, token); + } else { + /** \todo parse error */ + } + } + break; + case HUBBUB_TOKEN_END_TAG: + { + element_type type = element_type_from_name(treebuilder, + &token->data.tag.name); + + if (type == FRAMESET) { + hubbub_ns ns; + void *node; + + /** \todo fragment case */ + if (!element_stack_pop(treebuilder, &ns, &type, + &node)) { + /** \todo errors */ + } + + if (type != FRAMESET) + treebuilder->context.mode = AFTER_FRAMESET; + } else { + /** \todo parse error */ + treebuilder->context.mode = IN_BODY; + reprocess = true; + } + } + break; + case HUBBUB_TOKEN_EOF: + /** \todo parse error */ + break; + } + + return reprocess; +} + Propchange: trunk/hubbub/src/treebuilder/in_frameset.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/hubbub/src/treebuilder/modes.h URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/modes.h?re... ============================================================================== --- trunk/hubbub/src/treebuilder/modes.h (original) +++ trunk/hubbub/src/treebuilder/modes.h Mon Jun 30 07:02:44 2008 @@ -77,6 +77,8 @@ const hubbub_token *token); bool handle_after_body(hubbub_treebuilder *treebuilder, const hubbub_token *token); +bool handle_in_frameset(hubbub_treebuilder *treebuilder, + const hubbub_token *token); bool handle_after_after_body(hubbub_treebuilder *treebuilder, const hubbub_token *token);