Changeset 240037 in webkit

Timestamp:

Jan 16, 2019 8:03:31 AM (5 years ago)

Author:

Antti Koivisto

Message:

Add more assertions to find root cause for release assert hit in StyleResolver
​https://bugs.webkit.org/show_bug.cgi?id=193488
<rdar://problem/30983040>

Reviewed by Zalan Bujtas.

• css/StyleResolver.cpp:

(WebCore::StyleResolver::~StyleResolver):

Release assert we are not resolving tree style.

• dom/Document.cpp:

(WebCore::Document::setIsResolvingTreeStyle):

• dom/Document.h:

(WebCore::Document::isResolvingTreeStyle const):

• style/StyleTreeResolver.cpp:

(WebCore::Style::TreeResolver::Scope::Scope):
(WebCore::Style::TreeResolver::Scope::~Scope):

Set isResolvingTreeStyle bit when we have a tree resolver scope.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/StyleResolver.cpp (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• dom/Document.h (modified) (2 diffs)
• style/StyleTreeResolver.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-01-16  Antti Koivisto  <antti@apple.com>
+
+        Add more assertions to find root cause for release assert hit in StyleResolver
+        https://bugs.webkit.org/show_bug.cgi?id=193488
+        <rdar://problem/30983040>
+
+        Reviewed by Zalan Bujtas.
+
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::~StyleResolver):
+
+        Release assert we are not resolving tree style.
+
+        * dom/Document.cpp:
+        (WebCore::Document::setIsResolvingTreeStyle):
+        * dom/Document.h:
+        (WebCore::Document::isResolvingTreeStyle const):
+        * style/StyleTreeResolver.cpp:
+        (WebCore::Style::TreeResolver::Scope::Scope):
+        (WebCore::Style::TreeResolver::Scope::~Scope):
+
+        Set isResolvingTreeStyle bit when we have a tree resolver scope.
+
 2019-01-16  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -268 +268 @@
 StyleResolver::~StyleResolver()
 {
+    RELEASE_ASSERT(!m_document.isResolvingTreeStyle());
     RELEASE_ASSERT(!m_isDeleted);
     m_isDeleted = true;

trunk/Source/WebCore/dom/Document.cpp

@@ -2327 +2327 @@
 }
 
+void Document::setIsResolvingTreeStyle(bool value)
+{
+    RELEASE_ASSERT(value != m_isResolvingTreeStyle);
+    m_isResolvingTreeStyle = value;
+}
+
 void Document::createRenderTree()
 {

trunk/Source/WebCore/dom/Document.h

@@ -1335 +1335 @@
     bool inStyleRecalc() const { return m_inStyleRecalc; }
     bool inRenderTreeUpdate() const { return m_inRenderTreeUpdate; }
+    bool isResolvingTreeStyle() const { return m_isResolvingTreeStyle; }
+    void setIsResolvingTreeStyle(bool);
 
     void updateTextRenderer(Text&, unsigned offsetOfReplacedText, unsigned lengthOfReplacedText);
@@ -2018 +2020 @@
     bool m_closeAfterStyleRecalc { false };
     bool m_inRenderTreeUpdate { false };
+    bool m_isResolvingTreeStyle { false };
 
     bool m_gotoAnchorNeededAfterStylesheetsLoad { false };

trunk/Source/WebCore/style/StyleTreeResolver.cpp

@@ -68 +68 @@
     , sharingResolver(document, styleResolver.ruleSets(), selectorFilter)
 {
+    document.setIsResolvingTreeStyle(true);
 }
 
@@ -81 +82 @@
 TreeResolver::Scope::~Scope()
 {
+    if (!shadowRoot)
+        styleResolver.document().setIsResolvingTreeStyle(false);
+
     styleResolver.setOverrideDocumentElementStyle(nullptr);
 }