diff options
| author | Andreas Kling <kling@serenityos.org> | 2020-05-27 18:18:39 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2020-05-27 18:30:29 +0200 |
| commit | 1b0c39ca60cfbcd6112acab46950b405c3c88767 (patch) | |
| tree | 6757b7d0f07af791662b4240d360483ba4a59b6f | |
| parent | 1de29e3f59bbb1aca4700a24ec2a9175e7749a30 (diff) | |
| download | serenity-1b0c39ca60cfbcd6112acab46950b405c3c88767.zip | |
LibWeb: Handle more benign parse errors in the "in body" insertion mode
| -rw-r--r-- | Libraries/LibWeb/Parser/HTMLDocumentParser.cpp | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/Libraries/LibWeb/Parser/HTMLDocumentParser.cpp b/Libraries/LibWeb/Parser/HTMLDocumentParser.cpp index db0d6c804f..591e781d88 100644 --- a/Libraries/LibWeb/Parser/HTMLDocumentParser.cpp +++ b/Libraries/LibWeb/Parser/HTMLDocumentParser.cpp @@ -563,8 +563,8 @@ void HTMLDocumentParser::handle_in_body(HTMLToken& token) if (m_stack_of_open_elements.has_in_button_scope("p")) close_a_p_element(); if (current_node().tag_name().is_one_of("h1", "h2", "h3", "h4", "h5", "h6")) { - // FIXME: This is a parse error! - TODO(); + PARSE_ERROR(); + m_stack_of_open_elements.pop(); } insert_html_element(token); return; @@ -577,24 +577,19 @@ void HTMLDocumentParser::handle_in_body(HTMLToken& token) && !m_stack_of_open_elements.has_in_scope("h4") && !m_stack_of_open_elements.has_in_scope("h5") && !m_stack_of_open_elements.has_in_scope("h6")) { - TODO(); + PARSE_ERROR(); + return; } generate_implied_end_tags(); if (current_node().tag_name() != token.tag_name()) { - TODO(); + PARSE_ERROR(); } for (;;) { auto popped_element = m_stack_of_open_elements.pop(); - if (popped_element->tag_name() == "h1" - || popped_element->tag_name() == "h2" - || popped_element->tag_name() == "h3" - || popped_element->tag_name() == "h4" - || popped_element->tag_name() == "h5" - || popped_element->tag_name() == "h6") { + if (popped_element->tag_name().is_one_of("h1", "h2", "h3", "h4", "h5", "h6")) break; - } } return; } @@ -617,22 +612,25 @@ void HTMLDocumentParser::handle_in_body(HTMLToken& token) } if (token.is_start_tag() && token.tag_name().is_one_of("address", "article", "aside", "blockquote", "center", "details", "dialog", "dir", "div", "dl", "fieldset", "figcaption", "figure", "footer", "header", "hgroup", "main", "menu", "nav", "ol", "p", "section", "summary", "ul")) { - // FIXME: If the stack of open elements has a p element in button scope, then close a p element. + if (m_stack_of_open_elements.has_in_button_scope("p")) + close_a_p_element(); insert_html_element(token); return; } if (token.is_end_tag() && token.tag_name().is_one_of("address", "article", "aside", "blockquote", "center", "details", "dialog", "dir", "div", "dl", "fieldset", "figcaption", "figure", "footer", "header", "hgroup", "main", "menu", "nav", "ol", "p", "section", "summary", "ul")) { - // FIXME: If the stack of open elements has a p element in button scope, then close a p element. + if (m_stack_of_open_elements.has_in_button_scope("p")) + close_a_p_element(); if (!m_stack_of_open_elements.has_in_scope(token.tag_name())) { - ASSERT_NOT_REACHED(); + PARSE_ERROR(); + return; } generate_implied_end_tags(); if (current_node().tag_name() != token.tag_name()) { - ASSERT_NOT_REACHED(); + PARSE_ERROR(); } m_stack_of_open_elements.pop(); |