Title: [293343] branches/safari-613.2.7.0-branch/Source/WebCore
Revision
293343
Author
alanc...@apple.com
Date
2022-04-25 13:44:56 -0700 (Mon, 25 Apr 2022)

Log Message

Cherry-pick r293286. rdar://problem/92198272

    Crash under AsyncScrollingCoordinator::scrollingThreadAddedPendingUpdate()
    https://bugs.webkit.org/show_bug.cgi?id=239683
    <rdar://92198272>

    Reviewed by Alan Bujtas.

    Crash data suggest that m_page can be null in
    AsyncScrollingCoordinator::scheduleRenderingUpdate(), which does seem possible because
    scheduleRenderingUpdate() is a dispatch from the scrolling thread, and
    ScrollingCoordinator::pageDestroyed() may have run before it runs.

    * page/scrolling/AsyncScrollingCoordinator.cpp:
    (WebCore::AsyncScrollingCoordinator::scheduleRenderingUpdate):

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

Modified Paths

Diff

Modified: branches/safari-613.2.7.0-branch/Source/WebCore/ChangeLog (293342 => 293343)


--- branches/safari-613.2.7.0-branch/Source/WebCore/ChangeLog	2022-04-25 20:36:52 UTC (rev 293342)
+++ branches/safari-613.2.7.0-branch/Source/WebCore/ChangeLog	2022-04-25 20:44:56 UTC (rev 293343)
@@ -1,3 +1,40 @@
+2022-04-25  Alan Coon  <alanc...@apple.com>
+
+        Cherry-pick r293286. rdar://problem/92198272
+
+    Crash under AsyncScrollingCoordinator::scrollingThreadAddedPendingUpdate()
+    https://bugs.webkit.org/show_bug.cgi?id=239683
+    <rdar://92198272>
+    
+    Reviewed by Alan Bujtas.
+    
+    Crash data suggest that m_page can be null in
+    AsyncScrollingCoordinator::scheduleRenderingUpdate(), which does seem possible because
+    scheduleRenderingUpdate() is a dispatch from the scrolling thread, and
+    ScrollingCoordinator::pageDestroyed() may have run before it runs.
+    
+    * page/scrolling/AsyncScrollingCoordinator.cpp:
+    (WebCore::AsyncScrollingCoordinator::scheduleRenderingUpdate):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@293286 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-04-22  Simon Fraser  <simon.fra...@apple.com>
+
+            Crash under AsyncScrollingCoordinator::scrollingThreadAddedPendingUpdate()
+            https://bugs.webkit.org/show_bug.cgi?id=239683
+            <rdar://92198272>
+
+            Reviewed by Alan Bujtas.
+
+            Crash data suggest that m_page can be null in
+            AsyncScrollingCoordinator::scheduleRenderingUpdate(), which does seem possible because
+            scheduleRenderingUpdate() is a dispatch from the scrolling thread, and
+            ScrollingCoordinator::pageDestroyed() may have run before it runs.
+
+            * page/scrolling/AsyncScrollingCoordinator.cpp:
+            (WebCore::AsyncScrollingCoordinator::scheduleRenderingUpdate):
+
 2022-04-22  Alan Coon  <alanc...@apple.com>
 
         Cherry-pick r292274. rdar://problem/80544133

Modified: branches/safari-613.2.7.0-branch/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp (293342 => 293343)


--- branches/safari-613.2.7.0-branch/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp	2022-04-25 20:36:52 UTC (rev 293342)
+++ branches/safari-613.2.7.0-branch/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp	2022-04-25 20:44:56 UTC (rev 293343)
@@ -373,7 +373,8 @@
 
 void AsyncScrollingCoordinator::scheduleRenderingUpdate()
 {
-    m_page->scheduleRenderingUpdate(RenderingUpdateStep::ScrollingTreeUpdate);
+    if (m_page)
+        m_page->scheduleRenderingUpdate(RenderingUpdateStep::ScrollingTreeUpdate);
 }
 
 FrameView* AsyncScrollingCoordinator::frameViewForScrollingNode(ScrollingNodeID scrollingNodeID) const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to