Changeset 280638 in webkit

Timestamp:

Aug 4, 2021, 10:39:50 AM (5 years ago)

Author:

Antti Koivisto

Message:

Reduce Vector<> wasted capacity in some RuleSet code
​https://bugs.webkit.org/show_bug.cgi?id=224160
<rdar://problem/76369555>

Unreviewed, reverting revert r279242.

Reland as this was not related to the crashes seen.

• style/RuleSet.cpp:

(WebCore::Style::RuleSet::addRulesFromSheet):
(WebCore::Style::RuleSet::evaluateDynamicMediaQueryRules):
(WebCore::Style::shrinkDynamicRules):
(WebCore::Style::RuleSet::shrinkToFit):

• style/RuleSet.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• style/RuleSet.cpp (modified) (7 diffs)
• style/RuleSet.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-08-04  Antti Koivisto  <antti@apple.com>
+
+        Reduce Vector<> wasted capacity in some RuleSet code
+        https://bugs.webkit.org/show_bug.cgi?id=224160
+        <rdar://problem/76369555>
+
+        Unreviewed, reverting revert r279242.
+
+        Reland as this was not related to the crashes seen.
+
+        * style/RuleSet.cpp:
+        (WebCore::Style::RuleSet::addRulesFromSheet):
+        (WebCore::Style::RuleSet::evaluateDynamicMediaQueryRules):
+        (WebCore::Style::shrinkDynamicRules):
+        (WebCore::Style::RuleSet::shrinkToFit):
+        * style/RuleSet.h:
+
 2021-08-04  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Source/WebCore/style/RuleSet.cpp

@@ -314 +314 @@
     auto mediaQueryCollector = MediaQueryCollector { evaluator };
     addRulesFromSheet(sheet, mediaQueryCollector, nullptr, AddRulesMode::Normal);
+
+    if (m_autoShrinkToFitEnabled)
+        shrinkToFit();
 }
 
@@ -334 +337 @@
     m_hasViewportDependentMediaQueries = mediaQueryCollector.hasViewportDependentMediaQueries;
 
-    if (mediaQueryCollector.dynamicMediaQueryRules.isEmpty())
-        return;
-
-    auto firstNewIndex = m_dynamicMediaQueryRules.size();
-    m_dynamicMediaQueryRules.appendVector(WTFMove(mediaQueryCollector.dynamicMediaQueryRules));
-
-    // Set the initial values.
-    evaluateDynamicMediaQueryRules(evaluator, firstNewIndex);
+    if (!mediaQueryCollector.dynamicMediaQueryRules.isEmpty()) {
+        auto firstNewIndex = m_dynamicMediaQueryRules.size();
+        m_dynamicMediaQueryRules.appendVector(WTFMove(mediaQueryCollector.dynamicMediaQueryRules));
+
+        // Set the initial values.
+        evaluateDynamicMediaQueryRules(evaluator, firstNewIndex);
+    }
+
+    if (m_autoShrinkToFitEnabled)
+        shrinkToFit();
 }
 
@@ -356 +361 @@
 
     addChildRules(sheet.childRules(), mediaQueryCollector, resolver, mode);
-
-    if (m_autoShrinkToFitEnabled && mode == AddRulesMode::Normal)
-        shrinkToFit();
 }
 
@@ -416 +418 @@
                 ruleSet->addRule(*feature.styleRule, feature.selectorIndex, feature.selectorListIndex);
         }
+        ruleSet->shrinkToFit();
         return ruleSet;
     }).iterator->value;
@@ -473 +476 @@
 }
 
+static inline void shrinkDynamicRules(Vector<RuleSet::DynamicMediaQueryRules>& dynamicRules)
+{
+    for (auto& rule : dynamicRules)
+        rule.shrinkToFit();
+
+    dynamicRules.shrinkToFit();
+}
+
 void RuleSet::shrinkToFit()
 {
@@ -480 +491 @@
     shrinkMapVectorsToFit(m_tagLowercaseLocalNameRules);
     shrinkMapVectorsToFit(m_shadowPseudoElementRules);
+
     m_linkPseudoClassRules.shrinkToFit();
 #if ENABLE(VIDEO)
@@ -486 +498 @@
     m_hostPseudoClassRules.shrinkToFit();
     m_slottedPseudoElementRules.shrinkToFit();
+    m_partPseudoElementRules.shrinkToFit();
     m_focusPseudoClassRules.shrinkToFit();
     m_universalRules.shrinkToFit();
+
     m_pageRules.shrinkToFit();
     m_features.shrinkToFit();
+
+    shrinkDynamicRules(m_dynamicMediaQueryRules);
 }
 

trunk/Source/WebCore/style/RuleSet.h

@@ -77 +77 @@
         bool requiresFullReset { false };
         bool result { true };
+
+        void shrinkToFit()
+        {
+            mediaQuerySets.shrinkToFit();
+            affectedRulePositions.shrinkToFit();
+            ruleFeatures.shrinkToFit();
+        }
     };
 
@@ -154 +161 @@
     template<typename Function> void traverseRuleDatas(Function&&);
 
-
     AtomRuleMap m_idRules;
     AtomRuleMap m_classRules;
@@ -170 +176 @@
     RuleDataVector m_universalRules;
     Vector<StyleRulePage*> m_pageRules;
+    RuleFeatureSet m_features;
+    Vector<DynamicMediaQueryRules> m_dynamicMediaQueryRules;
+    HashMap<Vector<size_t>, Ref<const RuleSet>> m_mediaQueryInvalidationRuleSetCache;
     unsigned m_ruleCount { 0 };
     bool m_hasHostPseudoClassRulesMatchingInShadowTree { false };
     bool m_autoShrinkToFitEnabled { true };
-    RuleFeatureSet m_features;
     bool m_hasViewportDependentMediaQueries { false };
-    Vector<DynamicMediaQueryRules> m_dynamicMediaQueryRules;
-    HashMap<Vector<size_t>, Ref<const RuleSet>> m_mediaQueryInvalidationRuleSetCache;
 };