Title: [294836] branches/safari-613-branch/Source/WebCore
- Revision
- 294836
- Author
- alanc...@apple.com
- Date
- 2022-05-25 16:49:25 -0700 (Wed, 25 May 2022)
Log 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 <rb...@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
Modified Paths
Diff
Modified: branches/safari-613-branch/Source/WebCore/ChangeLog (294835 => 294836)
--- branches/safari-613-branch/Source/WebCore/ChangeLog 2022-05-25 23:42:36 UTC (rev 294835)
+++ branches/safari-613-branch/Source/WebCore/ChangeLog 2022-05-25 23:49:25 UTC (rev 294836)
@@ -1,3 +1,39 @@
+2022-05-19 Alan Coon <alanc...@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 <rb...@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 <rb...@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 <alanc...@apple.com>
Cherry-pick r294012. rdar://problem/92425915
Modified: branches/safari-613-branch/Source/WebCore/dom/Document.cpp (294835 => 294836)
--- branches/safari-613-branch/Source/WebCore/dom/Document.cpp 2022-05-25 23:42:36 UTC (rev 294835)
+++ branches/safari-613-branch/Source/WebCore/dom/Document.cpp 2022-05-25 23:49:25 UTC (rev 294836)
@@ -2148,6 +2148,8 @@
bool Document::updateStyleIfNeeded()
{
+ if (topDocument().isResolvingContainerQueries())
+ return false;
RefPtr<FrameView> frameView = view();
{
ScriptDisallowedScope::InMainThread scriptDisallowedScope;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
