<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[243984] releases/WebKitGTK/webkit-2.24/Source/WebKit</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/243984">243984</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2019-04-08 03:15:14 -0700 (Mon, 08 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/242597">r242597</a> - REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/242364">r242364</a>): [WPE] Do not stop the compositing run loop update timer on suspend
https://bugs.webkit.org/show_bug.cgi?id=195410

Patch by Carlos Garcia Campos <cgarcia@igalia.com> on 2019-03-07
Reviewed by Žan Doberšek.

Calling CompositingRunLoop::stopUpdates() on suspend is leaving the threaded compositor in an inconsistent
state, failing to resume and stopping the updates forever. This is causing timeouts in WPE layout tests. Instead
of calling stopUpdates(), a new suspend() is called, that stops the update timer, without changing the current
updae tha compositing state. A new method resume() is also added to schedule an update if needed.

* Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp:
(WebKit::CompositingRunLoop::suspend): Set state as suspended and stop the update timer.
(WebKit::CompositingRunLoop::resume): Set state as not suspended and start the update timer if it was scheduled
while suspended.
(WebKit::CompositingRunLoop::scheduleUpdate): Do not start the update timer when suspended.
(WebKit::CompositingRunLoop::compositionCompleted): Ditto.
(WebKit::CompositingRunLoop::updateCompleted): Ditto.
(WebKit::CompositingRunLoop::updateTimerFired): Add an assert to ensure the update timer is not fired while suspended.
* Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h:
* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
(WebKit::ThreadedCompositor::suspend): Call CompositingRunLoop::suspend() instead of stopUpdates().
(WebKit::ThreadedCompositor::resume): Call CompositingRunLoop::resume().</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit224SourceWebKitChangeLog">releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsthreadedcompositorCompositingRunLoopcpp">releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsthreadedcompositorCompositingRunLooph">releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsthreadedcompositorThreadedCompositorcpp">releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit224SourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog (243983 => 243984)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog   2019-04-08 10:15:11 UTC (rev 243983)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog      2019-04-08 10:15:14 UTC (rev 243984)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2019-03-07  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r242364): [WPE] Do not stop the compositing run loop update timer on suspend
+        https://bugs.webkit.org/show_bug.cgi?id=195410
+
+        Reviewed by Žan Doberšek.
+
+        Calling CompositingRunLoop::stopUpdates() on suspend is leaving the threaded compositor in an inconsistent
+        state, failing to resume and stopping the updates forever. This is causing timeouts in WPE layout tests. Instead
+        of calling stopUpdates(), a new suspend() is called, that stops the update timer, without changing the current
+        updae tha compositing state. A new method resume() is also added to schedule an update if needed.
+
+        * Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp:
+        (WebKit::CompositingRunLoop::suspend): Set state as suspended and stop the update timer.
+        (WebKit::CompositingRunLoop::resume): Set state as not suspended and start the update timer if it was scheduled
+        while suspended.
+        (WebKit::CompositingRunLoop::scheduleUpdate): Do not start the update timer when suspended.
+        (WebKit::CompositingRunLoop::compositionCompleted): Ditto.
+        (WebKit::CompositingRunLoop::updateCompleted): Ditto.
+        (WebKit::CompositingRunLoop::updateTimerFired): Add an assert to ensure the update timer is not fired while suspended.
+        * Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h:
+        * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
+        (WebKit::ThreadedCompositor::suspend): Call CompositingRunLoop::suspend() instead of stopUpdates().
+        (WebKit::ThreadedCompositor::resume): Call CompositingRunLoop::resume().
+
</ins><span class="cx"> 2019-03-04  Carlos Garcia Campos  <cgarcia@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [CoordinatedGraphics] The compositing loop is still running even after exiting AC mode
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsthreadedcompositorCompositingRunLoopcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp (243983 => 243984)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp        2019-04-08 10:15:11 UTC (rev 243983)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp   2019-04-08 10:15:14 UTC (rev 243984)
</span><span class="lines">@@ -94,6 +94,21 @@
</span><span class="cx">     m_dispatchSyncCondition.wait(m_dispatchSyncConditionMutex);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void CompositingRunLoop::suspend()
+{
+    LockHolder stateLocker(m_state.lock);
+    m_state.isSuspended = true;
+    m_updateTimer.stop();
+}
+
+void CompositingRunLoop::resume()
+{
+    LockHolder stateLocker(m_state.lock);
+    m_state.isSuspended = false;
+    if (m_state.update == UpdateState::Scheduled)
+        m_updateTimer.startOneShot(0_s);
+}
+
</ins><span class="cx"> void CompositingRunLoop::scheduleUpdate()
</span><span class="cx"> {
</span><span class="cx">     LockHolder stateLocker(m_state.lock);
</span><span class="lines">@@ -113,7 +128,8 @@
</span><span class="cx">     switch (m_state.update) {
</span><span class="cx">     case UpdateState::Idle:
</span><span class="cx">         m_state.update = UpdateState::Scheduled;
</span><del>-        m_updateTimer.startOneShot(0_s);
</del><ins>+        if (!m_state.isSuspended)
+            m_updateTimer.startOneShot(0_s);
</ins><span class="cx">         return;
</span><span class="cx">     case UpdateState::Scheduled:
</span><span class="cx">         return;
</span><span class="lines">@@ -156,7 +172,8 @@
</span><span class="cx">         if (m_state.pendingUpdate) {
</span><span class="cx">             m_state.pendingUpdate = false;
</span><span class="cx">             m_state.update = UpdateState::Scheduled;
</span><del>-            m_updateTimer.startOneShot(0_s);
</del><ins>+            if (!m_state.isSuspended)
+                m_updateTimer.startOneShot(0_s);
</ins><span class="cx">             return;
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -188,7 +205,8 @@
</span><span class="cx">         if (m_state.pendingUpdate) {
</span><span class="cx">             m_state.pendingUpdate = false;
</span><span class="cx">             m_state.update = UpdateState::Scheduled;
</span><del>-            m_updateTimer.startOneShot(0_s);
</del><ins>+            if (!m_state.isSuspended)
+                m_updateTimer.startOneShot(0_s);
</ins><span class="cx">             return;
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -204,6 +222,7 @@
</span><span class="cx">     {
</span><span class="cx">         // Both composition and scene update are now in progress.
</span><span class="cx">         LockHolder locker(m_state.lock);
</span><ins>+        ASSERT(!m_state.isSuspended);
</ins><span class="cx">         m_state.composition = CompositionState::InProgress;
</span><span class="cx">         m_state.update = UpdateState::InProgress;
</span><span class="cx">     }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsthreadedcompositorCompositingRunLooph"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h (243983 => 243984)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h  2019-04-08 10:15:11 UTC (rev 243983)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h     2019-04-08 10:15:14 UTC (rev 243984)
</span><span class="lines">@@ -47,6 +47,9 @@
</span><span class="cx">     void performTask(Function<void ()>&&);
</span><span class="cx">     void performTaskSync(Function<void ()>&&);
</span><span class="cx"> 
</span><ins>+    void suspend();
+    void resume();
+
</ins><span class="cx">     Lock& stateLock() { return m_state.lock; }
</span><span class="cx"> 
</span><span class="cx">     void scheduleUpdate();
</span><span class="lines">@@ -81,6 +84,7 @@
</span><span class="cx">         CompositionState composition { CompositionState::Idle };
</span><span class="cx">         UpdateState update { UpdateState::Idle };
</span><span class="cx">         bool pendingUpdate { false };
</span><ins>+        bool isSuspended { false };
</ins><span class="cx">     } m_state;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebKitSharedCoordinatedGraphicsthreadedcompositorThreadedCompositorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp (243983 => 243984)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp        2019-04-08 10:15:11 UTC (rev 243983)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp   2019-04-08 10:15:14 UTC (rev 243984)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx">     if (++m_suspendedCount > 1)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    m_compositingRunLoop->stopUpdates();
</del><ins>+    m_compositingRunLoop->suspend();
</ins><span class="cx">     m_compositingRunLoop->performTaskSync([this, protectedThis = makeRef(*this)] {
</span><span class="cx">         m_scene->setActive(false);
</span><span class="cx">     });
</span><span class="lines">@@ -136,6 +136,7 @@
</span><span class="cx">     m_compositingRunLoop->performTaskSync([this, protectedThis = makeRef(*this)] {
</span><span class="cx">         m_scene->setActive(true);
</span><span class="cx">     });
</span><ins>+    m_compositingRunLoop->resume();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ThreadedCompositor::setNativeSurfaceHandleForCompositing(uint64_t handle)
</span></span></pre>
</div>
</div>

</body>
</html>