Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(178)

Unified Diff: third_party/WebKit/Source/core/dom/StyleEngine.cpp

Issue 2487653002: Moved applyRuleSetChanges functions to StyleEngine. (Closed)
Patch Set: Added comment Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/dom/StyleEngine.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/dom/StyleEngine.cpp
diff --git a/third_party/WebKit/Source/core/dom/StyleEngine.cpp b/third_party/WebKit/Source/core/dom/StyleEngine.cpp
index 683057e1873132b9a505c9ada9702a6d8c88f320..4c3682279b8f7b5f6a07fc55edee45a08a6da56e 100644
--- a/third_party/WebKit/Source/core/dom/StyleEngine.cpp
+++ b/third_party/WebKit/Source/core/dom/StyleEngine.cpp
@@ -1029,6 +1029,96 @@ PassRefPtr<ComputedStyle> StyleEngine::findSharedStyle(
m_globalRuleSet.uncommonAttributeRuleSet(), *m_resolver)
.findSharedStyle();
}
+namespace {
+
+enum RuleSetFlags {
+ FontFaceRules = 1 << 0,
+ KeyframesRules = 1 << 1,
+ FullRecalcRules = 1 << 2
+};
+
+unsigned getRuleSetFlags(const HeapVector<Member<RuleSet>> ruleSets) {
+ unsigned flags = 0;
+ for (auto& ruleSet : ruleSets) {
+ ruleSet->compactRulesIfNeeded();
+ if (!ruleSet->keyframesRules().isEmpty())
+ flags |= KeyframesRules;
+ if (!ruleSet->fontFaceRules().isEmpty())
+ flags |= FontFaceRules;
+ if (ruleSet->needsFullRecalcForRuleSetInvalidation())
+ flags |= FullRecalcRules;
+ }
+ return flags;
+}
+
+} // namespace
+
+void StyleEngine::applyRuleSetChanges(
+ TreeScope& treeScope,
+ const ActiveStyleSheetVector& oldStyleSheets,
+ const ActiveStyleSheetVector& newStyleSheets) {
+ HeapVector<Member<RuleSet>> changedRuleSets;
+
+ ActiveSheetsChange change =
+ compareActiveStyleSheets(oldStyleSheets, newStyleSheets, changedRuleSets);
+ if (change == NoActiveSheetsChanged)
+ return;
+
+ // With rules added or removed, we need to re-aggregate rule meta data.
+ m_globalRuleSet.markDirty();
+
+ unsigned changedRuleFlags = getRuleSetFlags(changedRuleSets);
+ bool fontsChanged = treeScope.rootNode().isDocumentNode() &&
+ (changedRuleFlags & FontFaceRules);
+ unsigned appendStartIndex = 0;
+
+ // We don't need to clear the font cache if new sheets are appended.
+ if (fontsChanged && change == ActiveSheetsChanged)
+ clearFontCache();
+
+ // - If all sheets were removed, we remove the ScopedStyleResolver.
+ // - If new sheets were appended to existing ones, start appending after the
+ // common prefix.
+ // - For other diffs, reset author style and re-add all sheets for the
+ // TreeScope.
+ if (treeScope.scopedStyleResolver()) {
+ if (newStyleSheets.isEmpty())
+ resetAuthorStyle(treeScope);
+ else if (change == ActiveSheetsAppended)
+ appendStartIndex = oldStyleSheets.size();
+ else
+ treeScope.scopedStyleResolver()->resetAuthorStyle();
+ }
+
+ if (!newStyleSheets.isEmpty()) {
+ treeScope.ensureScopedStyleResolver().appendActiveStyleSheets(
+ appendStartIndex, newStyleSheets);
+ }
+
+ if (treeScope.document().hasPendingForcedStyleRecalc())
+ return;
+
+ if (!treeScope.document().body() ||
+ treeScope.document().hasNodesWithPlaceholderStyle()) {
+ treeScope.document().setNeedsStyleRecalc(
+ SubtreeStyleChange, StyleChangeReasonForTracing::create(
+ StyleChangeReason::CleanupPlaceholderStyles));
+ return;
+ }
+
+ if (changedRuleFlags & KeyframesRules)
+ ScopedStyleResolver::keyframesRulesAdded(treeScope);
+
+ if (fontsChanged || (changedRuleFlags & FullRecalcRules)) {
+ ScopedStyleResolver::invalidationRootForTreeScope(treeScope)
+ .setNeedsStyleRecalc(SubtreeStyleChange,
+ StyleChangeReasonForTracing::create(
+ StyleChangeReason::ActiveStylesheetsUpdate));
+ return;
+ }
+
+ scheduleInvalidationsForRuleSets(treeScope, changedRuleSets);
+}
DEFINE_TRACE(StyleEngine) {
visitor->trace(m_document);
« no previous file with comments | « third_party/WebKit/Source/core/dom/StyleEngine.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698