Changeset 294836 in webkit

Timestamp:

May 25, 2022, 4:49:25 PM (4 years ago)

Author:

Alan Coon

Message:

Cherry-pick r293147. rdar://problem/93601944

Skip release assert during container query resolution
​https://bugs.webkit.org/show_bug.cgi?id=239537

Patch by Rob Buis <​rbuis@igalia.com> on 2022-04-21
Reviewed by Antti Koivisto.

Skip release assert during container query resolution
since resolveStyle will be a no-op as the container
query resolution was started in resolveStyle, so calling
resolveStyle the second time will bail right away.

• dom/Document.cpp: (WebCore::Document::updateStyleIfNeeded):

Canonical link: ​https://commits.webkit.org/249843@main
git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@293147 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-613-branch/Source/WebCore

Files:

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

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

@@ +1 @@
+2022-05-19  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r293147. rdar://problem/93601944
+
+    Skip release assert during container query resolution
+    https://bugs.webkit.org/show_bug.cgi?id=239537
+    
+    Patch by Rob Buis <rbuis@igalia.com> on 2022-04-21
+    Reviewed by Antti Koivisto.
+    
+    Skip release assert during container query resolution
+    since resolveStyle will be a no-op as the container
+    query resolution was started in resolveStyle, so calling
+    resolveStyle the second time will bail right away.
+    
+    * dom/Document.cpp:
+    (WebCore::Document::updateStyleIfNeeded):
+    
+    Canonical link: https://commits.webkit.org/249843@main
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@293147 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-04-21  Rob Buis  <rbuis@igalia.com>
+
+            Skip release assert during container query resolution
+            https://bugs.webkit.org/show_bug.cgi?id=239537
+
+            Reviewed by Antti Koivisto.
+
+            Skip release assert during container query resolution
+            since resolveStyle will be a no-op as the container
+            query resolution was started in resolveStyle, so calling
+            resolveStyle the second time will bail right away.
+
+            * dom/Document.cpp:
+            (WebCore::Document::updateStyleIfNeeded):
+
 2022-05-16  Alan Coon  <alancoon@apple.com>
 

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

@@ -2149 +2149 @@
 bool Document::updateStyleIfNeeded()
 {
+    if (topDocument().isResolvingContainerQueries())
+        return false;
     RefPtr<FrameView> frameView = view();
     {