Changeset 240377 in webkit

Timestamp:

Jan 23, 2019, 5:21:22 PM (8 years ago)

Author:

Alan Coon

Message:

Cherry-pick r240037. rdar://problem/47458128

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.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@240037 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-607-branch/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)

branches/safari-607-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2019-01-23  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r240037. rdar://problem/47458128
+
+    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.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240037 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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-23  Alan Coon  <alancoon@apple.com>
 

branches/safari-607-branch/Source/WebCore/css/StyleResolver.cpp

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

branches/safari-607-branch/Source/WebCore/dom/Document.cpp

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

branches/safari-607-branch/Source/WebCore/dom/Document.h

@@ -1331 +1331 @@
     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);
@@ -2003 +2005 @@
     bool m_closeAfterStyleRecalc { false };
     bool m_inRenderTreeUpdate { false };
+    bool m_isResolvingTreeStyle { false };
 
     bool m_gotoAnchorNeededAfterStylesheetsLoad { false };

branches/safari-607-branch/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);
 }