Changeset 279242 in webkit

Timestamp:

Jun 24, 2021, 12:14:50 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, reverting r275633.
​https://bugs.webkit.org/show_bug.cgi?id=227373

Revert to see if this was the cause for some crashes seen
lately

Reverted changeset:

"Reduce Vector<> wasted capacity in some RuleSet code"
​https://bugs.webkit.org/show_bug.cgi?id=224160
​https://trac.webkit.org/changeset/275633

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-06-24  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r275633.
+        https://bugs.webkit.org/show_bug.cgi?id=227373
+
+        Revert to see if this was the cause for some crashes seen
+        lately
+
+        Reverted changeset:
+
+        "Reduce Vector<> wasted capacity in some RuleSet code"
+        https://bugs.webkit.org/show_bug.cgi?id=224160
+        https://trac.webkit.org/changeset/275633
+
 2021-06-24  Dmitry Kalinkin  <dmitry.kalinkin+webkit@gmail.com>
 

trunk/Source/WebCore/style/RuleSet.cpp

@@ -314 +314 @@
     auto mediaQueryCollector = MediaQueryCollector { evaluator };
     addRulesFromSheet(sheet, mediaQueryCollector, nullptr, AddRulesMode::Normal);
-
-    if (m_autoShrinkToFitEnabled)
-        shrinkToFit();
 }
 
@@ -337 +334 @@
     m_hasViewportDependentMediaQueries = mediaQueryCollector.hasViewportDependentMediaQueries;
 
-    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();
+    if (mediaQueryCollector.dynamicMediaQueryRules.isEmpty())
+        return;
+
+    auto firstNewIndex = m_dynamicMediaQueryRules.size();
+    m_dynamicMediaQueryRules.appendVector(WTFMove(mediaQueryCollector.dynamicMediaQueryRules));
+
+    // Set the initial values.
+    evaluateDynamicMediaQueryRules(evaluator, firstNewIndex);
 }
 
@@ -361 +356 @@
 
     addChildRules(sheet.childRules(), mediaQueryCollector, resolver, mode);
+
+    if (m_autoShrinkToFitEnabled && mode == AddRulesMode::Normal)
+        shrinkToFit();
 }
 
@@ -418 +416 @@
                 ruleSet->addRule(*feature.styleRule, feature.selectorIndex, feature.selectorListIndex);
         }
-        ruleSet->shrinkToFit();
         return ruleSet;
     }).iterator->value;
@@ -476 +473 @@
 }
 
-static inline void shrinkDynamicRules(Vector<RuleSet::DynamicMediaQueryRules>& dynamicRules)
-{
-    for (auto& rule : dynamicRules)
-        rule.shrinkToFit();
-
-    dynamicRules.shrinkToFit();
-}
-
 void RuleSet::shrinkToFit()
 {
@@ -491 +480 @@
     shrinkMapVectorsToFit(m_tagLowercaseLocalNameRules);
     shrinkMapVectorsToFit(m_shadowPseudoElementRules);
-
     m_linkPseudoClassRules.shrinkToFit();
 #if ENABLE(VIDEO)
@@ -498 +486 @@
     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();
-        }
     };
 
@@ -161 +154 @@
     template<typename Function> void traverseRuleDatas(Function&&);
 
+
     AtomRuleMap m_idRules;
     AtomRuleMap m_classRules;
@@ -176 +170 @@
     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;
 };