system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-17 05:12:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Add a StackOfOpenElements helper for "popping until a tag name"

Browse source
This commit is contained in:
Andreas Kling 2020-05-28 18:09:31 +02:00
parent e026a50777
commit c84212aaba
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Libraries/LibWeb/Parser/HTMLDocumentParser.cpp
View file

@ -472,11 +472,7 @@ void HTMLDocumentParser::close_a_p_element()
if (current_node().tag_name() != "p") {
PARSE_ERROR();
}
for (;;) {
auto popped_element = m_stack_of_open_elements.pop();
if (popped_element->tag_name() == "p")
break;
}
m_stack_of_open_elements.pop_until_an_element_with_tag_name_has_been_popped("p");
}
void HTMLDocumentParser::handle_after_body(HTMLToken& token)
@ -729,7 +725,7 @@ void HTMLDocumentParser::handle_in_body(HTMLToken& token)
PARSE_ERROR();
}
m_stack_of_open_elements.pop();
m_stack_of_open_elements.pop_until_an_element_with_tag_name_has_been_popped(token.tag_name());
return;
}
@ -946,9 +942,7 @@ void HTMLDocumentParser::handle_in_cell(HTMLToken& token)
PARSE_ERROR();
}
while (current_node().tag_name() != token.tag_name())
m_stack_of_open_elements.pop();
m_stack_of_open_elements.pop();
m_stack_of_open_elements.pop_until_an_element_with_tag_name_has_been_popped(token.tag_name())
m_list_of_active_formatting_elements.clear_up_to_the_last_marker();
@ -1043,9 +1037,8 @@ void HTMLDocumentParser::handle_in_table(HTMLToken& token)
PARSE_ERROR();
return;
}
while (current_node().tag_name() != "table")
m_stack_of_open_elements.pop();
m_stack_of_open_elements.pop();
m_stack_of_open_elements.pop_until_an_element_with_tag_name_has_been_popped("table");
reset_the_insertion_mode_appropriately();
return;

7
Libraries/LibWeb/Parser/StackOfOpenElements.cpp
View file

@ -94,4 +94,11 @@ bool StackOfOpenElements::contains(const Element& element) const
return false;
}
void StackOfOpenElements::pop_until_an_element_with_tag_name_has_been_popped(const FlyString& tag_name)
{
while (m_elements.last().tag_name() != tag_name)
pop();
pop();
}
}

2
Libraries/LibWeb/Parser/StackOfOpenElements.h
View file

@ -57,6 +57,8 @@ public:
const NonnullRefPtrVector<Element>& elements() const { return m_elements; }
void pop_until_an_element_with_tag_name_has_been_popped(const FlyString&);
private:
bool has_in_scope_impl(const FlyString& tag_name, const Vector<FlyString>&) const;
bool has_in_scope_impl(const Element& target_node, const Vector<FlyString>&) const;