mirrors/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-04-21 20:15:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibWeb: Optimize inherited style update

Browse source 
This commit changes the strategy for updating inherited styles. Instead
of marking all potentially affected nodes during style invalidation, the
decision is now made on-the-fly during style recalculation. Child nodes
will only have their inherited styles recalculated if their parent's
properties have changed.

On Discord this allows to 1000x reduce number of nodes with recalculated
inherited style.
This commit is contained in:
Aliaksandr Kalenik 2025-02-11 15:31:23 +01:00 • committed by Andreas Kling
parent bf15c7fa4b
commit 761e9aeaf7
Notes: github-actions[bot] 2025-02-11 18:24:07 +00:00
3 changed files with 13 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Libraries/LibWeb/DOM/Document.cpp
View file

@ -1346,7 +1346,7 @@ void Document::update_layout()
window->scroll_by(0, 0);
}
[[nodiscard]] static CSS::RequiredInvalidationAfterStyleChange update_style_recursively(Node& node, CSS::StyleComputer& style_computer)
[[nodiscard]] static CSS::RequiredInvalidationAfterStyleChange update_style_recursively(Node& node, CSS::StyleComputer& style_computer, bool needs_inherited_style_update)
{
bool const needs_full_style_update = node.document().needs_full_style_update();
CSS::RequiredInvalidationAfterStyleChange invalidation;
@ -1362,19 +1362,19 @@ void Document::update_layout()
if (is<Element>(node)) {
if (needs_full_style_update || node.needs_style_update()) {
invalidation |= static_cast<Element&>(node).recompute_style();
} else if (node.needs_inherited_style_update()) {
} else if (needs_inherited_style_update) {
invalidation |= static_cast<Element&>(node).recompute_inherited_style();
}
is_display_none = static_cast<Element&>(node).computed_properties()->display().is_none();
}
node.set_needs_style_update(false);
node.set_needs_inherited_style_update(false);
if (needs_full_style_update || node.child_needs_style_update()) {
bool children_need_inherited_style_update = !invalidation.is_none();
if (needs_full_style_update || node.child_needs_style_update() || children_need_inherited_style_update) {
if (node.is_element()) {
if (auto shadow_root = static_cast<DOM::Element&>(node).shadow_root()) {
if (needs_full_style_update || shadow_root->needs_style_update() || shadow_root->child_needs_style_update()) {
auto subtree_invalidation = update_style_recursively(*shadow_root, style_computer);
auto subtree_invalidation = update_style_recursively(*shadow_root, style_computer, children_need_inherited_style_update);
if (!is_display_none)
invalidation |= subtree_invalidation;
}
@ -1382,8 +1382,8 @@ void Document::update_layout()
}
node.for_each_child([&](auto& child) {
if (needs_full_style_update || child.needs_style_update() || child.needs_inherited_style_update() || child.child_needs_style_update()) {
auto subtree_invalidation = update_style_recursively(child, style_computer);
if (needs_full_style_update || child.needs_style_update() || children_need_inherited_style_update || child.child_needs_style_update()) {
auto subtree_invalidation = update_style_recursively(child, style_computer, children_need_inherited_style_update);
if (!is_display_none)
invalidation |= subtree_invalidation;
}
@ -1456,7 +1456,7 @@ void Document::update_style()
style_computer().reset_ancestor_filter();
auto invalidation = update_style_recursively(*this, style_computer());
auto invalidation = update_style_recursively(*this, style_computer(), false);
if (!invalidation.is_none()) {
invalidate_display_list();
}
@ -1699,11 +1699,8 @@ void Document::invalidate_style_of_elements_affected_by_has()
needs_style_recalculation = true;
}
if (needs_style_recalculation) {
if (needs_style_recalculation)
element.set_needs_style_update(true);
} else {
element.set_needs_inherited_style_update(true);
}
return TraversalDecision::Continue;
});
}
@ -1751,11 +1748,7 @@ void Document::invalidate_style_for_elements_affected_by_hover_change(Node& old_
return state;
};
Function<void(Node&, bool)> invalidate_hovered_elements_recursively = [&](Node& node, bool descendants_need_inherited_style_update) -> void {
if (descendants_need_inherited_style_update) {
node.set_needs_inherited_style_update(true);
}
bool invalidated_any_elements = false;
Function<void(Node&)> invalidate_hovered_elements_recursively = [&](Node& node) -> void {
if (node.is_element()) {
auto& element = static_cast<Element&>(node);
style_computer.push_ancestor(element);
@ -1765,13 +1758,12 @@ void Document::invalidate_style_for_elements_affected_by_hover_change(Node& old_
auto selectors_match_state_after = compute_hover_selectors_match_state(element);
if (selectors_match_state_before.view() != selectors_match_state_after.view()) {
element.set_needs_style_update(true);
invalidated_any_elements = true;
}
}
}
node.for_each_child([&](auto& child) {
invalidate_hovered_elements_recursively(child, descendants_need_inherited_style_update || invalidated_any_elements);
invalidate_hovered_elements_recursively(child);
return IterationDecision::Continue;
});
@ -1779,7 +1771,7 @@ void Document::invalidate_style_for_elements_affected_by_hover_change(Node& old_
style_computer.pop_ancestor(static_cast<Element&>(node));
};
invalidate_hovered_elements_recursively(root, false);
invalidate_hovered_elements_recursively(root);
}
void Document::set_hovered_node(Node* node)

21
Libraries/LibWeb/DOM/Node.cpp
View file

@ -533,11 +533,8 @@ void Node::invalidate_style(StyleInvalidationReason, Vector<CSS::InvalidationSet
} else if (options.invalidate_elements_that_use_css_custom_properties && element.style_uses_css_custom_properties()) {
needs_style_recalculation = true;
}
if (needs_style_recalculation) {
if (needs_style_recalculation)
element.set_needs_style_update(true);
} else {
element.set_needs_inherited_style_update(true);
}
return TraversalDecision::Continue;
});
};
@ -1394,22 +1391,6 @@ EventTarget* Node::get_parent(Event const&)
return parent();
}
void Node::set_needs_inherited_style_update(bool value)
{
if (m_needs_inherited_style_update == value)
return;
m_needs_inherited_style_update = value;
if (m_needs_inherited_style_update) {
for (auto* ancestor = parent_or_shadow_host(); ancestor; ancestor = ancestor->parent_or_shadow_host()) {
if (ancestor->m_child_needs_style_update)
break;
ancestor->m_child_needs_style_update = true;
}
document().schedule_style_update();
}
}
void Node::set_needs_layout_tree_update(bool value)
{
if (m_needs_layout_tree_update == value)

4
Libraries/LibWeb/DOM/Node.h
View file

@ -303,9 +303,6 @@ public:
void set_needs_style_update(bool);
void set_needs_style_update_internal(bool) { m_needs_style_update = true; }
bool needs_inherited_style_update() const { return m_needs_inherited_style_update; }
void set_needs_inherited_style_update(bool);
bool child_needs_style_update() const { return m_child_needs_style_update; }
void set_child_needs_style_update(bool b) { m_child_needs_style_update = b; }
@ -535,7 +532,6 @@ protected:
bool m_child_needs_layout_tree_update { false };
bool m_needs_style_update { false };
bool m_needs_inherited_style_update { false };
bool m_child_needs_style_update { false };
bool m_entire_subtree_needs_style_update { false };