<!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>[180204] trunk/Source/WebKit2</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/180204">180204</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-02-16 18:30:11 -0800 (Mon, 16 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Sometimes RemoteLayerBackingStore ends up non-volatile while the process is suspended
<rdar://problem/19842957>
https://bugs.webkit.org/show_bug.cgi?id=141675
Reviewed by Simon Fraser.
Previously, it was possible to get a layer tree flush in between the
process suspension cleanup code making surfaces volatile and the process
actually being suspended (it was racy because the suspension requires
a few IPC round trips). Depending on how far through the flush we got,
we could sometimes end up either making new non-volatile backing store,
or switching some recently-made-volatile backing store back to non-volatile.
We don't want to have any non-volatile backing store while suspended.
* UIProcess/ProcessThrottler.cpp:
(WebKit::ProcessThrottler::updateAssertion):
Inform the WebProcess when it's going from suspended to runnable state.
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::sendProcessDidResume):
* UIProcess/WebProcessProxy.h:
Forward the message along.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::processWillSuspend):
(WebKit::WebProcess::cancelProcessWillSuspend):
(WebKit::WebProcess::setAllLayerTreeStatesFrozen):
(WebKit::WebProcess::processDidResume):
Freeze all of this process' pages' layer trees when we start trying to suspend,
and un-freeze them when either suspension is cancelled or we resume.
* WebProcess/WebProcess.h:
* WebProcess/WebProcess.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessProcessThrottlercpp">trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessmessagesin">trunk/Source/WebKit2/WebProcess/WebProcess.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (180203 => 180204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-02-17 02:28:52 UTC (rev 180203)
+++ trunk/Source/WebKit2/ChangeLog        2015-02-17 02:30:11 UTC (rev 180204)
</span><span class="lines">@@ -1,5 +1,41 @@
</span><span class="cx"> 2015-02-16 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Sometimes RemoteLayerBackingStore ends up non-volatile while the process is suspended
+ <rdar://problem/19842957>
+ https://bugs.webkit.org/show_bug.cgi?id=141675
+
+ Reviewed by Simon Fraser.
+
+ Previously, it was possible to get a layer tree flush in between the
+ process suspension cleanup code making surfaces volatile and the process
+ actually being suspended (it was racy because the suspension requires
+ a few IPC round trips). Depending on how far through the flush we got,
+ we could sometimes end up either making new non-volatile backing store,
+ or switching some recently-made-volatile backing store back to non-volatile.
+ We don't want to have any non-volatile backing store while suspended.
+
+ * UIProcess/ProcessThrottler.cpp:
+ (WebKit::ProcessThrottler::updateAssertion):
+ Inform the WebProcess when it's going from suspended to runnable state.
+
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::sendProcessDidResume):
+ * UIProcess/WebProcessProxy.h:
+ Forward the message along.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::processWillSuspend):
+ (WebKit::WebProcess::cancelProcessWillSuspend):
+ (WebKit::WebProcess::setAllLayerTreeStatesFrozen):
+ (WebKit::WebProcess::processDidResume):
+ Freeze all of this process' pages' layer trees when we start trying to suspend,
+ and un-freeze them when either suspension is cancelled or we resume.
+
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in:
+
+2015-02-16 Tim Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> Adopt CAMachPort-as-layer-contents
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=141687
</span><span class="cx"> <rdar://problem/19393233>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessProcessThrottlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp (180203 => 180204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp        2015-02-17 02:28:52 UTC (rev 180203)
+++ trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp        2015-02-17 02:30:11 UTC (rev 180204)
</span><span class="lines">@@ -71,10 +71,15 @@
</span><span class="cx"> m_assertion->setState(AssertionState::Background);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+
+ bool shouldBeRunnable = m_foregroundCounter.value() || m_backgroundCounter.value();
</ins><span class="cx">
</span><span class="cx"> // If we're currently waiting for the Web process to do suspension cleanup, but no longer need to be suspended, tell the Web process to cancel the cleanup.
</span><del>- if (m_suspendTimer.isActive() && (m_foregroundCounter.value() || m_backgroundCounter.value()))
</del><ins>+ if (m_suspendTimer.isActive() && shouldBeRunnable)
</ins><span class="cx"> m_process->sendCancelProcessWillSuspend();
</span><ins>+
+ if (m_assertion && m_assertion->state() == AssertionState::Suspended && shouldBeRunnable)
+ m_process->sendProcessDidResume();
</ins><span class="cx">
</span><span class="cx"> updateAssertionNow();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (180203 => 180204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp        2015-02-17 02:28:52 UTC (rev 180203)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp        2015-02-17 02:30:11 UTC (rev 180204)
</span><span class="lines">@@ -762,6 +762,12 @@
</span><span class="cx"> send(Messages::WebProcess::CancelProcessWillSuspend(), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcessProxy::sendProcessDidResume()
+{
+ if (canSendMessage())
+ send(Messages::WebProcess::ProcessDidResume(), 0);
+}
+
</ins><span class="cx"> void WebProcessProxy::processReadyToSuspend()
</span><span class="cx"> {
</span><span class="cx"> m_throttler->processReadyToSuspend();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (180203 => 180204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h        2015-02-17 02:28:52 UTC (rev 180203)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h        2015-02-17 02:30:11 UTC (rev 180204)
</span><span class="lines">@@ -140,6 +140,7 @@
</span><span class="cx"> void processReadyToSuspend();
</span><span class="cx"> void sendCancelProcessWillSuspend();
</span><span class="cx"> void didCancelProcessSuspension();
</span><ins>+ void sendProcessDidResume();
</ins><span class="cx">
</span><span class="cx"> void setIsHoldingLockedFiles(bool);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (180203 => 180204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp        2015-02-17 02:28:52 UTC (rev 180203)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp        2015-02-17 02:30:11 UTC (rev 180204)
</span><span class="lines">@@ -1164,6 +1164,7 @@
</span><span class="cx"> void WebProcess::processWillSuspend()
</span><span class="cx"> {
</span><span class="cx"> memoryPressureHandler().releaseMemory(true);
</span><ins>+ setAllLayerTreeStatesFrozen(true);
</ins><span class="cx">
</span><span class="cx"> if (!markAllLayersVolatileIfPossible())
</span><span class="cx"> m_processSuspensionCleanupTimer.startRepeating(std::chrono::milliseconds(20));
</span><span class="lines">@@ -1173,6 +1174,8 @@
</span><span class="cx">
</span><span class="cx"> void WebProcess::cancelProcessWillSuspend()
</span><span class="cx"> {
</span><ins>+ setAllLayerTreeStatesFrozen(false);
+
</ins><span class="cx"> // If we've already finished cleaning up and sent ProcessReadyToSuspend, we
</span><span class="cx"> // shouldn't send DidCancelProcessSuspension; the UI process strictly expects one or the other.
</span><span class="cx"> if (!m_processSuspensionCleanupTimer.isActive())
</span><span class="lines">@@ -1193,6 +1196,14 @@
</span><span class="cx"> return successfullyMarkedAllLayersVolatile;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcess::setAllLayerTreeStatesFrozen(bool frozen)
+{
+ for (auto& page : m_pageMap.values()) {
+ if (auto drawingArea = page->drawingArea())
+ drawingArea->setLayerTreeStateIsFrozen(frozen);
+ }
+}
+
</ins><span class="cx"> void WebProcess::processSuspensionCleanupTimerFired()
</span><span class="cx"> {
</span><span class="cx"> if (markAllLayersVolatileIfPossible()) {
</span><span class="lines">@@ -1200,6 +1211,11 @@
</span><span class="cx"> parentProcessConnection()->send(Messages::WebProcessProxy::ProcessReadyToSuspend(), 0);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+void WebProcess::processDidResume()
+{
+ setAllLayerTreeStatesFrozen(false);
+}
</ins><span class="cx">
</span><span class="cx"> void WebProcess::pageDidEnterWindow(uint64_t pageID)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (180203 => 180204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h        2015-02-17 02:28:52 UTC (rev 180203)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h        2015-02-17 02:30:11 UTC (rev 180204)
</span><span class="lines">@@ -181,7 +181,9 @@
</span><span class="cx"> void processWillSuspend();
</span><span class="cx"> void cancelProcessWillSuspend();
</span><span class="cx"> bool markAllLayersVolatileIfPossible();
</span><ins>+ void setAllLayerTreeStatesFrozen(bool);
</ins><span class="cx"> void processSuspensionCleanupTimerFired();
</span><ins>+ void processDidResume();
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void resetAllGeolocationPermissions();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (180203 => 180204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in        2015-02-17 02:28:52 UTC (rev 180203)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in        2015-02-17 02:30:11 UTC (rev 180204)
</span><span class="lines">@@ -96,4 +96,5 @@
</span><span class="cx">
</span><span class="cx"> ProcessWillSuspend()
</span><span class="cx"> CancelProcessWillSuspend()
</span><ins>+ ProcessDidResume()
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>