Changeset 273793 in webkit

Timestamp:

Mar 2, 2021, 7:08:42 PM (6 years ago)

Author:

Alan Coon

Message:

Cherry-pick r273415. rdar://problem/74953177

Move PostResolutionCallbackDisabler to resolveComputedStyle
​https://bugs.webkit.org/show_bug.cgi?id=222350

Reviewed by Ryosuke Niwa.

It can be constructed and deleted repeatedly in styleForElementIgnoringPendingStylesheets when
resolveComputedStyle calls it in a loop.

• dom/Document.cpp: (WebCore::Document::styleForElementIgnoringPendingStylesheets):
• dom/Element.cpp: (WebCore::Element::resolveComputedStyle): (WebCore::Element::resolvePseudoElementStyle):

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

Location:

branches/safari-612.1.5-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• dom/Element.cpp (modified) (2 diffs)

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

@@ +1 @@
+2021-03-02  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r273415. rdar://problem/74953177
+
+    Move PostResolutionCallbackDisabler to resolveComputedStyle
+    https://bugs.webkit.org/show_bug.cgi?id=222350
+    
+    Reviewed by Ryosuke Niwa.
+    
+    It can be constructed and deleted repeatedly in styleForElementIgnoringPendingStylesheets when
+    resolveComputedStyle calls it in a loop.
+    
+    * dom/Document.cpp:
+    (WebCore::Document::styleForElementIgnoringPendingStylesheets):
+    * dom/Element.cpp:
+    (WebCore::Element::resolveComputedStyle):
+    (WebCore::Element::resolvePseudoElementStyle):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@273415 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-02-24  Antti Koivisto  <antti@apple.com>
+
+            Move PostResolutionCallbackDisabler to resolveComputedStyle
+            https://bugs.webkit.org/show_bug.cgi?id=222350
+
+            Reviewed by Ryosuke Niwa.
+
+            It can be constructed and deleted repeatedly in styleForElementIgnoringPendingStylesheets when
+            resolveComputedStyle calls it in a loop.
+
+            * dom/Document.cpp:
+            (WebCore::Document::styleForElementIgnoringPendingStylesheets):
+            * dom/Element.cpp:
+            (WebCore::Element::resolveComputedStyle):
+            (WebCore::Element::resolvePseudoElementStyle):
+
 2021-03-02  Alan Coon  <alancoon@apple.com>
 

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

@@ -2208 +2208 @@
     ASSERT(!element.isPseudoElement() || pseudoElementSpecifier == PseudoId::None);
     ASSERT(pseudoElementSpecifier == PseudoId::None || parentStyle);
-
-    // On iOS request delegates called during styleForElement may result in re-entering WebKit and killing the style resolver.
-    Style::PostResolutionCallbackDisabler disabler(*this, Style::PostResolutionCallbackDisabler::DrainCallbacks::No);
+    ASSERT(Style::postResolutionCallbacksAreSuspended());
 
     SetForScope<bool> change(m_ignorePendingStylesheets, true);

branches/safari-612.1.5-branch/Source/WebCore/dom/Element.cpp

@@ -3356 +3356 @@
     }
 
+    // On iOS request delegates called during styleForElement may result in re-entering WebKit and killing the style resolver.
+    Style::PostResolutionCallbackDisabler disabler(document(), Style::PostResolutionCallbackDisabler::DrainCallbacks::No);
+
     // Resolve and cache styles starting from the most distant ancestor.
     for (auto& element : elementsRequiringComputedStyle) {
@@ -3425 +3428 @@
     ASSERT(parentStyle);
     ASSERT(!parentStyle->getCachedPseudoStyle(pseudoElementSpecifier));
+
+    Style::PostResolutionCallbackDisabler disabler(document(), Style::PostResolutionCallbackDisabler::DrainCallbacks::No);
 
     auto style = document().styleForElementIgnoringPendingStylesheets(*this, parentStyle, pseudoElementSpecifier);