RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 19:27:45 +00:00
Code Issues Activity Actions

LibWeb: Simplify construction of :before and :after pseudo elements

Browse source 
Let create_pseudo_element_if_needed() take care of inserting the pseudo
elements into the layout tree as well.
This commit is contained in:
Andreas Kling 2022-10-06 13:56:54 +02:00
parent da781e90c1
commit 1ab7a8e0db
2 changed files with 22 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp
View file

@ -141,7 +141,7 @@ void TreeBuilder::insert_node_into_inline_or_block_ancestor(Layout::Node& node,
} }
} }
RefPtr<Layout::Node> TreeBuilder::create_pseudo_element_if_needed(DOM::Element& element, CSS::Selector::PseudoElement pseudo_element) void TreeBuilder::create_pseudo_element_if_needed(DOM::Element& element, CSS::Selector::PseudoElement pseudo_element, AppendOrPrepend mode)
{ {
auto& document = element.document(); auto& document = element.document();
auto& style_computer = document.style_computer(); auto& style_computer = document.style_computer();
@ -154,9 +154,12 @@ RefPtr<Layout::Node> TreeBuilder::create_pseudo_element_if_needed(DOM::Element&
if (pseudo_element_display.is_none() if (pseudo_element_display.is_none()
|| pseudo_element_content.type == CSS::ContentData::Type::Normal || pseudo_element_content.type == CSS::ContentData::Type::Normal
|| pseudo_element_content.type == CSS::ContentData::Type::None) || pseudo_element_content.type == CSS::ContentData::Type::None)
return nullptr; return;
auto pseudo_element_node = DOM::Element::create_layout_node_for_display_type(document, pseudo_element_display, pseudo_element_style, nullptr);
if (!pseudo_element_node)
return;
if (auto pseudo_element_node = DOM::Element::create_layout_node_for_display_type(document, pseudo_element_display, move(pseudo_element_style), nullptr)) {
pseudo_element_node->set_generated(true); pseudo_element_node->set_generated(true);
// FIXME: Handle images, and multiple values // FIXME: Handle images, and multiple values
if (pseudo_element_content.type == CSS::ContentData::Type::String) { if (pseudo_element_content.type == CSS::ContentData::Type::String) {
@ -168,11 +171,10 @@ RefPtr<Layout::Node> TreeBuilder::create_pseudo_element_if_needed(DOM::Element&
} else { } else {
TODO(); TODO();
} }
return pseudo_element_node.ptr();
}
return nullptr; element.set_pseudo_element_node({}, CSS::Selector::PseudoElement::Before, pseudo_element_node);
}; insert_node_into_inline_or_block_ancestor(*pseudo_element_node, mode);
}
void TreeBuilder::create_layout_tree(DOM::Node& dom_node, TreeBuilder::Context& context) void TreeBuilder::create_layout_tree(DOM::Node& dom_node, TreeBuilder::Context& context)
{ {
@ -237,14 +239,8 @@ void TreeBuilder::create_layout_tree(DOM::Node& dom_node, TreeBuilder::Context&
if (is<DOM::Element>(dom_node)) { if (is<DOM::Element>(dom_node)) {
auto& element = static_cast<DOM::Element&>(dom_node); auto& element = static_cast<DOM::Element&>(dom_node);
push_parent(verify_cast<NodeWithStyle>(*layout_node)); push_parent(verify_cast<NodeWithStyle>(*layout_node));
if (auto before_node = create_pseudo_element_if_needed(element, CSS::Selector::PseudoElement::Before)) { create_pseudo_element_if_needed(element, CSS::Selector::PseudoElement::Before, AppendOrPrepend::Prepend);
element.set_pseudo_element_node({}, CSS::Selector::PseudoElement::Before, before_node.ptr()); create_pseudo_element_if_needed(element, CSS::Selector::PseudoElement::After, AppendOrPrepend::Append);
insert_node_into_inline_or_block_ancestor(*before_node, AppendOrPrepend::Prepend);
}
if (auto after_node = create_pseudo_element_if_needed(element, CSS::Selector::PseudoElement::After)) {
element.set_pseudo_element_node({}, CSS::Selector::PseudoElement::After, after_node.ptr());
insert_node_into_inline_or_block_ancestor(*after_node, AppendOrPrepend::Append);
}
pop_parent(); pop_parent();
} }

2
Userland/Libraries/LibWeb/Layout/TreeBuilder.h
View file

@ -45,7 +45,7 @@ private:
Prepend, Prepend,
}; };
void insert_node_into_inline_or_block_ancestor(Layout::Node&, AppendOrPrepend); void insert_node_into_inline_or_block_ancestor(Layout::Node&, AppendOrPrepend);
RefPtr<Layout::Node> create_pseudo_element_if_needed(DOM::Element&, CSS::Selector::PseudoElement); void create_pseudo_element_if_needed(DOM::Element&, CSS::Selector::PseudoElement, AppendOrPrepend);
RefPtr<Layout::Node> m_layout_root; RefPtr<Layout::Node> m_layout_root;
Vector<Layout::NodeWithStyle&> m_ancestor_stack; Vector<Layout::NodeWithStyle&> m_ancestor_stack;