Changeset 228678 in webkit

Timestamp:

Feb 19, 2018 5:59:56 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r228453 - REGRESSION(r228313): Membuster | macOS | All Devices | 1.5 MB
​https://bugs.webkit.org/show_bug.cgi?id=182744
<rdar://problem/37463770>

Reviewed by Zalan Bujtas.

We need to respect low memory notifications explicitly now that the compiled selectors are not part of RuleData.

• css/StyleRule.cpp:

(WebCore::StyleRule::StyleRule):

• css/StyleRule.h:

Switch to std::unique_ptr<[]> from Vector to avoid unnecessary bloat.

• css/StyleSheetContents.cpp:

(WebCore::traverseRulesInVector):
(WebCore::StyleSheetContents::traverseRules const):

Add a rule traversal function, similar to the existing traverseSubresources.

(WebCore::StyleSheetContents::traverseSubresources const):

Use traverseRules to implement traverseSubresources.

(WebCore::traverseSubresourcesInRules): Deleted.

• css/StyleSheetContents.h:
• page/MemoryRelease.cpp:

(WebCore::releaseCriticalMemory):

• style/StyleScope.cpp:

(WebCore::Style::Scope::releaseMemory):

Release memory for compiled selectors on memory notification.

• style/StyleScope.h:

Location:

releases/WebKitGTK/webkit-2.20/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/StyleRule.cpp (modified) (1 diff)
• css/StyleRule.h (modified) (3 diffs)
• css/StyleSheetContents.cpp (modified) (3 diffs)
• css/StyleSheetContents.h (modified) (1 diff)
• page/MemoryRelease.cpp (modified) (1 diff)
• style/StyleScope.cpp (modified) (1 diff)
• style/StyleScope.h (modified) (1 diff)

releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-13  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION(r228313): Membuster | macOS | All Devices | 1.5 MB
+        https://bugs.webkit.org/show_bug.cgi?id=182744
+        <rdar://problem/37463770>
+
+        Reviewed by Zalan Bujtas.
+
+        We need to respect low memory notifications explicitly now that the compiled selectors are not part of RuleData.
+
+        * css/StyleRule.cpp:
+        (WebCore::StyleRule::StyleRule):
+        * css/StyleRule.h:
+
+        Switch to std::unique_ptr<[]> from Vector to avoid unnecessary bloat.
+
+        * css/StyleSheetContents.cpp:
+        (WebCore::traverseRulesInVector):
+        (WebCore::StyleSheetContents::traverseRules const):
+
+        Add a rule traversal function, similar to the existing traverseSubresources.
+
+        (WebCore::StyleSheetContents::traverseSubresources const):
+
+        Use traverseRules to implement traverseSubresources.
+
+        (WebCore::traverseSubresourcesInRules): Deleted.
+        * css/StyleSheetContents.h:
+        * page/MemoryRelease.cpp:
+        (WebCore::releaseCriticalMemory):
+        * style/StyleScope.cpp:
+        (WebCore::Style::Scope::releaseMemory):
+
+        Release memory for compiled selectors on memory notification.
+
+        * style/StyleScope.h:
+
 2018-02-09  Antti Koivisto  <antti@apple.com>
 

releases/WebKitGTK/webkit-2.20/Source/WebCore/css/StyleRule.cpp

@@ -192 +192 @@
     , m_properties(o.properties().mutableCopy())
     , m_selectorList(o.m_selectorList)
-#if ENABLE(CSS_SELECTOR_JIT)
-    , m_compiledSelectors(o.m_compiledSelectors)
-#endif
 {
 }

releases/WebKitGTK/webkit-2.20/Source/WebCore/css/StyleRule.h

@@ -133 +133 @@
     using StyleRuleBase::hasDocumentSecurityOrigin;
 
-    void parserAdoptSelectorVector(Vector<std::unique_ptr<CSSParserSelector>>& selectors) { m_selectorList.adoptSelectorVector(selectors); }
-    void wrapperAdoptSelectorList(CSSSelectorList& selectors) { m_selectorList = WTFMove(selectors); }
+    void wrapperAdoptSelectorList(CSSSelectorList& selectors)
+    {
+        m_selectorList = WTFMove(selectors);
+#if ENABLE(CSS_SELECTOR_JIT)
+        m_compiledSelectors = nullptr;
+#endif
+    }
     void parserAdoptSelectorArray(CSSSelector* selectors) { m_selectorList.adoptSelectorArray(selectors); }
 
@@ -144 +149 @@
     CompiledSelector& compiledSelectorForListIndex(unsigned index)
     {
-        if (m_compiledSelectors.isEmpty())
-            m_compiledSelectors.grow(m_selectorList.listSize());
+        if (!m_compiledSelectors)
+            m_compiledSelectors = std::make_unique<CompiledSelector[]>(m_selectorList.listSize());
         return m_compiledSelectors[index];
+    }
+    void releaseCompiledSelectors() const
+    {
+        m_compiledSelectors = nullptr;
     }
 #endif
@@ -162 +171 @@
 
 #if ENABLE(CSS_SELECTOR_JIT)
-    Vector<CompiledSelector> m_compiledSelectors;
+    mutable std::unique_ptr<CompiledSelector[]> m_compiledSelectors;
 #endif
 };

releases/WebKitGTK/webkit-2.20/Source/WebCore/css/StyleSheetContents.cpp

@@ -431 +431 @@
 }
 
-static bool traverseSubresourcesInRules(const Vector<RefPtr<StyleRuleBase>>& rules, const WTF::Function<bool (const CachedResource&)>& handler)
+static bool traverseRulesInVector(const Vector<RefPtr<StyleRuleBase>>& rules, const WTF::Function<bool (const StyleRuleBase&)>& handler)
 {
     for (auto& rule : rules) {
+        if (handler(*rule))
+            return true;
         switch (rule->type()) {
-        case StyleRuleBase::Style: {
-            auto* properties = downcast<StyleRule>(*rule).propertiesWithoutDeferredParsing();
-            if (properties && properties->traverseSubresources(handler))
-                return true;
-            break;
-        }
-        case StyleRuleBase::FontFace:
-            if (downcast<StyleRuleFontFace>(*rule).properties().traverseSubresources(handler))
-                return true;
-            break;
         case StyleRuleBase::Media: {
             auto* childRules = downcast<StyleRuleMedia>(*rule).childRulesWithoutDeferredParsing();
-            if (childRules && traverseSubresourcesInRules(*childRules, handler))
+            if (childRules && traverseRulesInVector(*childRules, handler))
                 return true;
             break;
@@ -453 +445 @@
         case StyleRuleBase::Import:
             ASSERT_NOT_REACHED();
-#if ASSERT_DISABLED
-            FALLTHROUGH;
-#endif
+            break;
+        case StyleRuleBase::Style:
+        case StyleRuleBase::FontFace:
         case StyleRuleBase::Page:
         case StyleRuleBase::Keyframes:
@@ -472 +464 @@
 }
 
+bool StyleSheetContents::traverseRules(const WTF::Function<bool (const StyleRuleBase&)>& handler) const
+{
+    for (auto& importRule : m_importRules) {
+        if (handler(*importRule))
+            return true;
+        auto* importedStyleSheet = importRule->styleSheet();
+        if (importedStyleSheet && importedStyleSheet->traverseRules(handler))
+            return true;
+    }
+    return traverseRulesInVector(m_childRules, handler);
+}
+
 bool StyleSheetContents::traverseSubresources(const WTF::Function<bool (const CachedResource&)>& handler) const
 {
-    for (auto& importRule : m_importRules) {
-        if (auto* cachedResource = importRule->cachedCSSStyleSheet()) {
-            if (handler(*cachedResource))
-                return true;
+    return traverseRules([&] (const StyleRuleBase& rule) {
+        switch (rule.type()) {
+        case StyleRuleBase::Style: {
+            auto* properties = downcast<StyleRule>(rule).propertiesWithoutDeferredParsing();
+            return properties && properties->traverseSubresources(handler);
         }
-        auto* importedStyleSheet = importRule->styleSheet();
-        if (importedStyleSheet && importedStyleSheet->traverseSubresources(handler))
-            return true;
-    }
-    return traverseSubresourcesInRules(m_childRules, handler);
+        case StyleRuleBase::FontFace:
+            return downcast<StyleRuleFontFace>(rule).properties().traverseSubresources(handler);
+        case StyleRuleBase::Import:
+            if (auto* cachedResource = downcast<StyleRuleImport>(rule).cachedCSSStyleSheet())
+                return handler(*cachedResource);
+            return false;
+        case StyleRuleBase::Media:
+        case StyleRuleBase::Page:
+        case StyleRuleBase::Keyframes:
+        case StyleRuleBase::Namespace:
+        case StyleRuleBase::Unknown:
+        case StyleRuleBase::Charset:
+        case StyleRuleBase::Keyframe:
+        case StyleRuleBase::Supports:
+#if ENABLE(CSS_DEVICE_ADAPTATION)
+        case StyleRuleBase::Viewport:
+#endif
+            return false;
+        };
+        ASSERT_NOT_REACHED();
+        return false;
+    });
 }
 

releases/WebKitGTK/webkit-2.20/Source/WebCore/css/StyleSheetContents.h

@@ -87 +87 @@
 
     URL completeURL(const String& url) const;
+    bool traverseRules(const WTF::Function<bool (const StyleRuleBase&)>& handler) const;
     bool traverseSubresources(const WTF::Function<bool (const CachedResource&)>& handler) const;
 

releases/WebKitGTK/webkit-2.20/Source/WebCore/page/MemoryRelease.cpp

@@ -85 +85 @@
 
     for (auto& document : copyToVectorOf<RefPtr<Document>>(Document::allDocuments())) {
-        document->styleScope().clearResolver();
+        document->styleScope().releaseMemory();
         document->fontSelector().emptyCaches();
     }

releases/WebKitGTK/webkit-2.20/Source/WebCore/style/StyleScope.cpp

@@ -133 +133 @@
     if (!m_shadowRoot)
         m_document.didClearStyleResolver();
+}
+
+void Scope::releaseMemory()
+{
+    if (!m_shadowRoot) {
+        for (auto* descendantShadowRoot : m_document.inDocumentShadowRoots())
+            descendantShadowRoot->styleScope().releaseMemory();
+    }
+
+#if ENABLE(CSS_SELECTOR_JIT)
+    for (auto& sheet : m_activeStyleSheets) {
+        sheet->contents().traverseRules([] (const StyleRuleBase& rule) {
+            if (is<StyleRule>(rule))
+                downcast<StyleRule>(rule).releaseCompiledSelectors();
+            return false;
+        });
+    }
+#endif
+    clearResolver();
 }
 

releases/WebKitGTK/webkit-2.20/Source/WebCore/style/StyleScope.h

@@ -119 +119 @@
     StyleResolver* resolverIfExists();
     void clearResolver();
+    void releaseMemory();
 
     const Document& document() const { return m_document; }