Changeset 216970 in webkit

Timestamp:

May 17, 2017 12:18:56 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

[Threaded Compositor] SHOULD NEVER BE REACHED in WebKit::CompositingRunLoop::updateCompleted
​https://bugs.webkit.org/show_bug.cgi?id=172167

Reviewed by Michael Catanzaro.

This is still happening, even after r216182, less often but still happens. There are two conditions in which
this can happen:

• Again in force repaint. r216182 fixed the case of force repaint called when update state is completed, but it can also crash if update state is inProgress or PendingAfterCompletion when m_coordinateUpdateCompletionWithClient is true.
• When the threaded compositor is invalidated right after renderLayerTree() starts, but before it finishes.

• Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:

(WebKit::ThreadedCompositor::invalidate): Invalidate the refresh monitor right after stopping updates in the
compositing run loop to ensure no more updates are scheduled.
(WebKit::ThreadedCompositor::renderLayerTree): Check the scene is still active before calling sceneUpdateFinished().
(WebKit::ThreadedCompositor::updateSceneState): Do not update m_coordinateUpdateCompletionWithClient when in
force repaint.

• Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp:

(WebKit::ThreadedDisplayRefreshMonitor::dispatchDisplayRefreshCallback): Return early if the monitor has been invalidated.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp (modified) (4 diffs)
• Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-05-17  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [Threaded Compositor] SHOULD NEVER BE REACHED in WebKit::CompositingRunLoop::updateCompleted
+        https://bugs.webkit.org/show_bug.cgi?id=172167
+
+        Reviewed by Michael Catanzaro.
+
+        This is still happening, even after r216182, less often but still happens. There are two conditions in which
+        this can happen:
+
+         - Again in force repaint. r216182 fixed the case of force repaint called when update state is completed, but it
+           can also crash if update state is inProgress or PendingAfterCompletion when m_coordinateUpdateCompletionWithClient
+           is true.
+         - When the threaded compositor is invalidated right after renderLayerTree() starts, but before it finishes.
+
+        * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
+        (WebKit::ThreadedCompositor::invalidate): Invalidate the refresh monitor right after stopping updates in the
+        compositing run loop to ensure no more updates are scheduled.
+        (WebKit::ThreadedCompositor::renderLayerTree): Check the scene is still active before calling sceneUpdateFinished().
+        (WebKit::ThreadedCompositor::updateSceneState): Do not update m_coordinateUpdateCompletionWithClient when in
+        force repaint.
+        * Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp:
+        (WebKit::ThreadedDisplayRefreshMonitor::dispatchDisplayRefreshCallback): Return early if the monitor has been invalidated.
+
 2017-05-16  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp

@@ -125 +125 @@
     m_scene->detach();
     m_compositingRunLoop->stopUpdates();
+#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
+    m_displayRefreshMonitor->invalidate();
+#endif
     m_compositingRunLoop->performTaskSync([this, protectedThis = makeRef(*this)] {
         m_scene->purgeGLResources();
@@ -133 +136 @@
         m_scene = nullptr;
     });
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
-    m_displayRefreshMonitor->invalidate();
-#endif
     m_compositingRunLoop = nullptr;
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
-    m_displayRefreshMonitor->invalidate();
-#endif
 }
 
@@ -266 +263 @@
 
 #if PLATFORM(GTK)
-    sceneUpdateFinished();
+    if (m_scene->isActive())
+        sceneUpdateFinished();
 #endif
 }
@@ -290 +288 @@
 
         m_clientRendersNextFrame.store(true);
+        // Do not change m_coordinateUpdateCompletionWithClient while in force repaint.
+        if (m_inForceRepaint)
+            return;
         bool coordinateUpdate = std::any_of(state.layersToUpdate.begin(), state.layersToUpdate.end(),
             [](const std::pair<CoordinatedLayerID, CoordinatedGraphicsLayerState>& it) {

trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp

@@ -68 +68 @@
 void ThreadedDisplayRefreshMonitor::dispatchDisplayRefreshCallback()
 {
+    if (!m_compositor)
+        return;
     m_displayRefreshTimer.startOneShot(0);
 }