RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-01 03:08:13 +00:00
Code Issues Activity Actions

LibWeb: Remove CSS::StyleInvalidator in favor of dirtying + lazy update

Browse source 
Style updates are lazy since late last year, so the StyleInvalidator is
actually hurting us more than it's helping by running the entire CSS
selector machine on the whole DOM for every attribute change.

Instead, simply mark the entire DOM dirty and let the lazy style update
mechanism run *once* on next event loop iteration.
This commit is contained in:
Andreas Kling 2022-02-05 15:19:16 +01:00
parent e6f279dada
commit 04bec7a4f5
6 changed files with 37 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

55
Userland/Libraries/LibWeb/CSS/StyleInvalidator.cpp
View file

@ -1,55 +0,0 @@
/*
* Copyright (c) 2020, Linus Groh <linusg@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <LibWeb/CSS/CSSStyleRule.h>
#include <LibWeb/CSS/StyleInvalidator.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/DOM/Element.h>
namespace Web::CSS {
StyleInvalidator::StyleInvalidator(DOM::Document& document)
: m_document(document)
{
if (!m_document.should_invalidate_styles_on_attribute_changes())
return;
auto& style_computer = m_document.style_computer();
m_document.for_each_in_inclusive_subtree_of_type<DOM::Element>([&](auto& element) {
m_elements_and_matching_rules_before.set(&element, style_computer.collect_matching_rules(element));
return IterationDecision::Continue;
});
}
StyleInvalidator::~StyleInvalidator()
{
if (!m_document.should_invalidate_styles_on_attribute_changes())
return;
auto& style_computer = m_document.style_computer();
m_document.for_each_in_inclusive_subtree_of_type<DOM::Element>([&](auto& element) {
auto matching_rules_before_iter = m_elements_and_matching_rules_before.find(&element);
if (matching_rules_before_iter == m_elements_and_matching_rules_before.end()) {
element.set_needs_style_update(true);
return IterationDecision::Continue;
}
auto& matching_rules_before = matching_rules_before_iter->value;
auto matching_rules_after = style_computer.collect_matching_rules(element);
if (matching_rules_before.size() != matching_rules_after.size()) {
element.set_needs_style_update(true);
return IterationDecision::Continue;
}
style_computer.sort_matching_rules(matching_rules_before);
style_computer.sort_matching_rules(matching_rules_after);
for (size_t i = 0; i < matching_rules_before.size(); ++i) {
if (matching_rules_before[i].rule != matching_rules_after[i].rule) {
element.set_needs_style_update(true);
break;
}
}
return IterationDecision::Continue;
});
}
}

26
Userland/Libraries/LibWeb/CSS/StyleInvalidator.h
View file

@ -1,26 +0,0 @@
/*
* Copyright (c) 2020, Linus Groh <linusg@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <AK/HashMap.h>
#include <LibWeb/CSS/StyleComputer.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/DOM/Element.h>
namespace Web::CSS {
class StyleInvalidator {
public:
explicit StyleInvalidator(DOM::Document&);
~StyleInvalidator();
private:
DOM::Document& m_document;
HashMap<DOM::Element*, Vector<MatchingRule>> m_elements_and_matching_rules_before;
};
}