Changeset 229332 in webkit

Timestamp:

Mar 6, 2018, 11:41:35 AM (8 years ago)

Author:

Antti Koivisto

Message:

Cache hasComplexSelectorsForStyleAttribute bit
​https://bugs.webkit.org/show_bug.cgi?id=183363

Reviewed by Andreas Kling.

• css/DocumentRuleSets.cpp:

(WebCore::DocumentRuleSets::collectFeatures const):
(WebCore::DocumentRuleSets::hasComplexSelectorsForStyleAttribute const):

Cache the bit to avoid hash lookups.

• css/DocumentRuleSets.h:
• dom/StyledElement.cpp:

(WebCore::StyledElement::invalidateStyleAttribute):
(WebCore::shouldSynchronizeStyleAttributeImmediatelyForInvalidation): Deleted.

Move code to DocumentRuleSets.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/DocumentRuleSets.cpp (modified) (2 diffs)
• css/DocumentRuleSets.h (modified) (2 diffs)
• dom/StyledElement.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-03-06  Antti Koivisto  <antti@apple.com>
+
+        Cache hasComplexSelectorsForStyleAttribute bit
+        https://bugs.webkit.org/show_bug.cgi?id=183363
+
+        Reviewed by Andreas Kling.
+
+        * css/DocumentRuleSets.cpp:
+        (WebCore::DocumentRuleSets::collectFeatures const):
+        (WebCore::DocumentRuleSets::hasComplexSelectorsForStyleAttribute const):
+
+        Cache the bit to avoid hash lookups.
+
+        * css/DocumentRuleSets.h:
+        * dom/StyledElement.cpp:
+        (WebCore::StyledElement::invalidateStyleAttribute):
+        (WebCore::shouldSynchronizeStyleAttributeImmediatelyForInvalidation): Deleted.
+
+        Move code to DocumentRuleSets.
+
 2018-03-06  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/css/DocumentRuleSets.cpp

@@ -170 +170 @@
     m_classInvalidationRuleSets.clear();
     m_attributeInvalidationRuleSets.clear();
+    m_cachedHasComplexSelectorsForStyleAttribute = std::nullopt;
 
     m_features.shrinkToFit();
@@ -211 +212 @@
 }
 
+bool DocumentRuleSets::hasComplexSelectorsForStyleAttribute() const
+{
+    auto compute = [&] {
+        auto* ruleSets = attributeInvalidationRuleSets(HTMLNames::styleAttr->localName());
+        if (!ruleSets)
+            return false;
+        for (auto& ruleSet : *ruleSets) {
+            if (ruleSet.matchElement != MatchElement::Subject)
+                return true;
+        }
+        return false;
+    };
+
+    if (!m_cachedHasComplexSelectorsForStyleAttribute)
+        m_cachedHasComplexSelectorsForStyleAttribute = compute();
+
+    return *m_cachedHasComplexSelectorsForStyleAttribute;
+}
+
 } // namespace WebCore

trunk/Source/WebCore/css/DocumentRuleSets.h

@@ -63 +63 @@
     const Vector<InvalidationRuleSet>* attributeInvalidationRuleSets(const AtomicString& attributeName) const;
 
+    bool hasComplexSelectorsForStyleAttribute() const;
+
     void setIsForShadowScope() { m_isForShadowScope = true; }
 
@@ -95 +97 @@
     mutable HashMap<AtomicString, std::unique_ptr<Vector<InvalidationRuleSet>>> m_classInvalidationRuleSets;
     mutable HashMap<AtomicString, std::unique_ptr<Vector<InvalidationRuleSet>>> m_attributeInvalidationRuleSets;
+    mutable std::optional<bool> m_cachedHasComplexSelectorsForStyleAttribute;
 };
 

trunk/Source/WebCore/dom/StyledElement.cpp

@@ -147 +147 @@
 }
 
-static bool shouldSynchronizeStyleAttributeImmediatelyForInvalidation(StyledElement& element)
-{
-    // In rare case there is a complex attribute selector targeting style attribute (like "[style] ~ div") we need to synchronize immediately.
-    auto* ruleSets = element.styleResolver().ruleSets().attributeInvalidationRuleSets(styleAttr->localName());
-    if (!ruleSets)
-        return false;
-    for (auto& ruleSet : *ruleSets) {
-        if (ruleSet.matchElement != MatchElement::Subject)
-            return true;
-    }
-    return false;
-}
-
 void StyledElement::invalidateStyleAttribute()
 {
@@ -168 +155 @@
     invalidateStyle();
 
-    if (shouldSynchronizeStyleAttributeImmediatelyForInvalidation(*this)) {
+    // In the rare case of selectors like "[style] ~ div" we need to synchronize immediately to invalidate.
+    if (styleResolver().ruleSets().hasComplexSelectorsForStyleAttribute()) {
         if (auto* inlineStyle = this->inlineStyle()) {
             elementData()->setStyleAttributeIsDirty(false);