Changeset 248297 in webkit

Timestamp:

Aug 6, 2019 9:18:05 AM (5 years ago)

Author:

Antti Koivisto

Message:

Add release assert against InvalidationRuleSet mutation during invalidation
​https://bugs.webkit.org/show_bug.cgi?id=200467

Reviewed by Chris Dumez.

Try to get a more informative stack for rdar://problem/53413013

• css/DocumentRuleSets.cpp:

(WebCore::DocumentRuleSets::~DocumentRuleSets):
(WebCore::DocumentRuleSets::collectFeatures const):

• css/DocumentRuleSets.h:
• style/AttributeChangeInvalidation.cpp:

(WebCore::Style::AttributeChangeInvalidation::invalidateStyleWithRuleSets):

• style/ClassChangeInvalidation.cpp:

(WebCore::Style::ClassChangeInvalidation::invalidateStyleWithRuleSets):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/DocumentRuleSets.cpp (modified) (3 diffs)
• css/DocumentRuleSets.h (modified) (1 diff)
• style/AttributeChangeInvalidation.cpp (modified) (2 diffs)
• style/ClassChangeInvalidation.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-06  Antti Koivisto  <antti@apple.com>
+
+        Add release assert against InvalidationRuleSet mutation during invalidation
+        https://bugs.webkit.org/show_bug.cgi?id=200467
+
+        Reviewed by Chris Dumez.
+
+        Try to get a more informative stack for rdar://problem/53413013
+
+        * css/DocumentRuleSets.cpp:
+        (WebCore::DocumentRuleSets::~DocumentRuleSets):
+        (WebCore::DocumentRuleSets::collectFeatures const):
+        * css/DocumentRuleSets.h:
+        * style/AttributeChangeInvalidation.cpp:
+        (WebCore::Style::AttributeChangeInvalidation::invalidateStyleWithRuleSets):
+        * style/ClassChangeInvalidation.cpp:
+        (WebCore::Style::ClassChangeInvalidation::invalidateStyleWithRuleSets):
+
 2019-08-06  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/css/DocumentRuleSets.cpp

@@ -38 +38 @@
 namespace WebCore {
 
+// For catching <rdar://problem/53413013>
+bool DocumentRuleSets::s_isInvalidatingStyleWithRuleSets { false };
+
 DocumentRuleSets::DocumentRuleSets(StyleResolver& styleResolver)
     : m_styleResolver(styleResolver)
@@ -45 +48 @@
 }
 
-DocumentRuleSets::~DocumentRuleSets() = default;
+DocumentRuleSets::~DocumentRuleSets()
+{
+    RELEASE_ASSERT(!s_isInvalidatingStyleWithRuleSets);
+}
 
 RuleSet* DocumentRuleSets::userAgentMediaQueryStyle() const
@@ -149 +155 @@
 void DocumentRuleSets::collectFeatures() const
 {
+    RELEASE_ASSERT(!s_isInvalidatingStyleWithRuleSets);
+
     m_features.clear();
     // Collect all ids and rules using sibling selectors (:first-child and similar)

trunk/Source/WebCore/css/DocumentRuleSets.h

@@ -77 +77 @@
     RuleFeatureSet& mutableFeatures();
 
+    static bool s_isInvalidatingStyleWithRuleSets;
+
 private:
     void collectFeatures() const;

trunk/Source/WebCore/style/AttributeChangeInvalidation.cpp

@@ -30 +30 @@
 #include "StyleInvalidationFunctions.h"
 #include "StyleInvalidator.h"
+#include <wtf/SetForScope.h>
 
 namespace WebCore {
@@ -89 +90 @@
 void AttributeChangeInvalidation::invalidateStyleWithRuleSets()
 {
+    SetForScope<bool> isInvalidating(DocumentRuleSets::s_isInvalidatingStyleWithRuleSets, true);
+
     for (auto* invalidationRuleSet : m_invalidationRuleSets) {
         Invalidator invalidator(*invalidationRuleSet->ruleSet);

trunk/Source/WebCore/style/ClassChangeInvalidation.cpp

@@ -32 +32 @@
 #include "StyleInvalidator.h"
 #include <wtf/BitVector.h>
+#include <wtf/SetForScope.h>
 
 namespace WebCore {
@@ -120 +121 @@
 void ClassChangeInvalidation::invalidateStyleWithRuleSets()
 {
+    SetForScope<bool> isInvalidating(DocumentRuleSets::s_isInvalidatingStyleWithRuleSets, true);
+
     for (auto* invalidationRuleSet : m_invalidationRuleSets) {
         Invalidator invalidator(*invalidationRuleSet->ruleSet);