<!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>[184326] 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/184326">184326</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-13 20:07:25 -0700 (Wed, 13 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename ProcessThrottlerClient::{send, cancel}ProcessWillSuspend() to {send, cancel}PrepareToSuspend()
https://bugs.webkit.org/show_bug.cgi?id=144619
<rdar://problem/20812779>
Reviewed by Andy Estes.
The names of the functions ProcessThrottlerClient::{send, cancel}ProcessWillSuspend() are misnomers. These
functions are called when the ProcessThrottler wants to prepare the process that it manages for suspension
and changes its mind, respectively. That is, these functions do not actually correspond to the OS decision
to suspend a process or cancel the suspension of a process, respectively. So, rename these functions and
associated {Network, Web}ProcessProxy message names to better describe their purpose.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::prepareToSuspend):
(WebKit::NetworkProcess::cancelPrepareToSuspend):
(WebKit::NetworkProcess::processWillSuspend): Deleted.
(WebKit::NetworkProcess::cancelProcessWillSuspend): Deleted.
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/NetworkProcess.messages.in:
* UIProcess/Network/NetworkProcessProxy.cpp:
(WebKit::NetworkProcessProxy::sendPrepareToSuspend):
(WebKit::NetworkProcessProxy::sendCancelPrepareToSuspend):
(WebKit::NetworkProcessProxy::sendProcessWillSuspend): Deleted.
(WebKit::NetworkProcessProxy::sendCancelProcessWillSuspend): Deleted.
* UIProcess/Network/NetworkProcessProxy.h:
* UIProcess/ProcessThrottler.cpp:
(WebKit::ProcessThrottler::updateAssertion):
* UIProcess/ProcessThrottlerClient.h:
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcess::actualPrepareToSuspend): Formerly named prepareToSuspend.
(WebKit::WebProcessProxy::sendPrepareToSuspend):
(WebKit::WebProcessProxy::sendCancelPrepareToSuspend):
(WebKit::WebProcessProxy::sendProcessWillSuspend): Deleted.
(WebKit::WebProcessProxy::sendCancelProcessWillSuspend): Deleted.
* UIProcess/WebProcessProxy.h:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::prepareToSuspend):
(WebKit::WebProcess::cancelPrepareToSuspend):
(WebKit::WebProcess::processWillSuspend): Deleted.
(WebKit::WebProcess::cancelProcessWillSuspend): Deleted.
* 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="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessProcessThrottlercpp">trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessProcessThrottlerClienth">trunk/Source/WebKit2/UIProcess/ProcessThrottlerClient.h</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 (184325 => 184326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-14 01:34:08 UTC (rev 184325)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-14 03:07:25 UTC (rev 184326)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2015-05-13 Daniel Bates <dabates@apple.com>
+
+ Rename ProcessThrottlerClient::{send, cancel}ProcessWillSuspend() to {send, cancel}PrepareToSuspend()
+ https://bugs.webkit.org/show_bug.cgi?id=144619
+ <rdar://problem/20812779>
+
+ Reviewed by Andy Estes.
+
+ The names of the functions ProcessThrottlerClient::{send, cancel}ProcessWillSuspend() are misnomers. These
+ functions are called when the ProcessThrottler wants to prepare the process that it manages for suspension
+ and changes its mind, respectively. That is, these functions do not actually correspond to the OS decision
+ to suspend a process or cancel the suspension of a process, respectively. So, rename these functions and
+ associated {Network, Web}ProcessProxy message names to better describe their purpose.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::prepareToSuspend):
+ (WebKit::NetworkProcess::cancelPrepareToSuspend):
+ (WebKit::NetworkProcess::processWillSuspend): Deleted.
+ (WebKit::NetworkProcess::cancelProcessWillSuspend): Deleted.
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkProcess.messages.in:
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::sendPrepareToSuspend):
+ (WebKit::NetworkProcessProxy::sendCancelPrepareToSuspend):
+ (WebKit::NetworkProcessProxy::sendProcessWillSuspend): Deleted.
+ (WebKit::NetworkProcessProxy::sendCancelProcessWillSuspend): Deleted.
+ * UIProcess/Network/NetworkProcessProxy.h:
+ * UIProcess/ProcessThrottler.cpp:
+ (WebKit::ProcessThrottler::updateAssertion):
+ * UIProcess/ProcessThrottlerClient.h:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcess::actualPrepareToSuspend): Formerly named prepareToSuspend.
+ (WebKit::WebProcessProxy::sendPrepareToSuspend):
+ (WebKit::WebProcessProxy::sendCancelPrepareToSuspend):
+ (WebKit::WebProcessProxy::sendProcessWillSuspend): Deleted.
+ (WebKit::WebProcessProxy::sendCancelProcessWillSuspend): Deleted.
+ * UIProcess/WebProcessProxy.h:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::prepareToSuspend):
+ (WebKit::WebProcess::cancelPrepareToSuspend):
+ (WebKit::WebProcess::processWillSuspend): Deleted.
+ (WebKit::WebProcess::cancelProcessWillSuspend): Deleted.
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in:
+
</ins><span class="cx"> 2015-05-13 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Don't create a per-pool data store when using the modern API
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (184325 => 184326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-05-14 01:34:08 UTC (rev 184325)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-05-14 03:07:25 UTC (rev 184326)
</span><span class="lines">@@ -514,13 +514,13 @@
</span><span class="cx"> handled = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcess::processWillSuspend()
</del><ins>+void NetworkProcess::prepareToSuspend()
</ins><span class="cx"> {
</span><span class="cx"> lowMemoryHandler(true);
</span><span class="cx"> parentProcessConnection()->send(Messages::NetworkProcessProxy::ProcessReadyToSuspend(), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcess::cancelProcessWillSuspend()
</del><ins>+void NetworkProcess::cancelPrepareToSuspend()
</ins><span class="cx"> {
</span><span class="cx"> parentProcessConnection()->send(Messages::NetworkProcessProxy::DidCancelProcessSuspension(), 0);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (184325 => 184326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-05-14 01:34:08 UTC (rev 184325)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-05-14 03:07:25 UTC (rev 184326)
</span><span class="lines">@@ -79,8 +79,8 @@
</span><span class="cx"> bool canHandleHTTPSServerTrustEvaluation() const { return m_canHandleHTTPSServerTrustEvaluation; }
</span><span class="cx">
</span><span class="cx"> void processWillSuspendImminently(bool& handled);
</span><del>- void processWillSuspend();
- void cancelProcessWillSuspend();
</del><ins>+ void prepareToSuspend();
+ void cancelPrepareToSuspend();
</ins><span class="cx"> void processDidResume();
</span><span class="cx">
</span><span class="cx"> // Diagnostic messages logging.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in (184325 => 184326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2015-05-14 01:34:08 UTC (rev 184325)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2015-05-14 03:07:25 UTC (rev 184326)
</span><span class="lines">@@ -59,8 +59,8 @@
</span><span class="cx"> SetCacheModel(uint32_t cacheModel);
</span><span class="cx">
</span><span class="cx"> ProcessWillSuspendImminently() -> (bool handled)
</span><del>- ProcessWillSuspend()
- CancelProcessWillSuspend()
</del><ins>+ PrepareToSuspend()
+ CancelPrepareToSuspend()
</ins><span class="cx"> ProcessDidResume()
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (184325 => 184326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2015-05-14 01:34:08 UTC (rev 184325)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2015-05-14 03:07:25 UTC (rev 184326)
</span><span class="lines">@@ -323,16 +323,16 @@
</span><span class="cx"> 0, std::chrono::seconds(1), IPC::InterruptWaitingIfSyncMessageArrives);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcessProxy::sendProcessWillSuspend()
</del><ins>+void NetworkProcessProxy::sendPrepareToSuspend()
</ins><span class="cx"> {
</span><span class="cx"> if (canSendMessage())
</span><del>- send(Messages::NetworkProcess::ProcessWillSuspend(), 0);
</del><ins>+ send(Messages::NetworkProcess::PrepareToSuspend(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcessProxy::sendCancelProcessWillSuspend()
</del><ins>+void NetworkProcessProxy::sendCancelPrepareToSuspend()
</ins><span class="cx"> {
</span><span class="cx"> if (canSendMessage())
</span><del>- send(Messages::NetworkProcess::CancelProcessWillSuspend(), 0);
</del><ins>+ send(Messages::NetworkProcess::CancelPrepareToSuspend(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcessProxy::didCancelProcessSuspension()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h (184325 => 184326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2015-05-14 01:34:08 UTC (rev 184325)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2015-05-14 03:07:25 UTC (rev 184326)
</span><span class="lines">@@ -88,8 +88,8 @@
</span><span class="cx">
</span><span class="cx"> // ProcessThrottlerClient
</span><span class="cx"> void sendProcessWillSuspendImminently() override;
</span><del>- void sendProcessWillSuspend() override;
- void sendCancelProcessWillSuspend() override;
</del><ins>+ void sendPrepareToSuspend() override;
+ void sendCancelPrepareToSuspend() override;
</ins><span class="cx"> void sendProcessDidResume() override;
</span><span class="cx">
</span><span class="cx"> // IPC::Connection::Client
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessProcessThrottlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp (184325 => 184326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp 2015-05-14 01:34:08 UTC (rev 184325)
+++ trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp 2015-05-14 03:07:25 UTC (rev 184326)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> // in the background for too long.
</span><span class="cx"> if (m_assertion && m_assertion->state() != AssertionState::Suspended && !m_foregroundCounter.value() && !m_backgroundCounter.value()) {
</span><span class="cx"> ++m_suspendMessageCount;
</span><del>- m_process.sendProcessWillSuspend();
</del><ins>+ m_process.sendPrepareToSuspend();
</ins><span class="cx"> m_suspendTimer.startOneShot(processSuspensionTimeout);
</span><span class="cx"> m_assertion->setState(AssertionState::Background);
</span><span class="cx"> return;
</span><span class="lines">@@ -76,7 +76,7 @@
</span><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><span class="cx"> if (m_suspendTimer.isActive() && shouldBeRunnable)
</span><del>- m_process.sendCancelProcessWillSuspend();
</del><ins>+ m_process.sendCancelPrepareToSuspend();
</ins><span class="cx">
</span><span class="cx"> if (m_assertion && m_assertion->state() == AssertionState::Suspended && shouldBeRunnable)
</span><span class="cx"> m_process.sendProcessDidResume();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessProcessThrottlerClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ProcessThrottlerClient.h (184325 => 184326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ProcessThrottlerClient.h 2015-05-14 01:34:08 UTC (rev 184325)
+++ trunk/Source/WebKit2/UIProcess/ProcessThrottlerClient.h 2015-05-14 03:07:25 UTC (rev 184326)
</span><span class="lines">@@ -33,8 +33,8 @@
</span><span class="cx"> virtual ~ProcessThrottlerClient() { }
</span><span class="cx">
</span><span class="cx"> virtual void sendProcessWillSuspendImminently() = 0;
</span><del>- virtual void sendProcessWillSuspend() = 0;
- virtual void sendCancelProcessWillSuspend() = 0;
</del><ins>+ virtual void sendPrepareToSuspend() = 0;
+ virtual void sendCancelPrepareToSuspend() = 0;
</ins><span class="cx"> virtual void sendProcessDidResume() = 0;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (184325 => 184326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-05-14 01:34:08 UTC (rev 184325)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-05-14 03:07:25 UTC (rev 184326)
</span><span class="lines">@@ -899,16 +899,16 @@
</span><span class="cx"> 0, std::chrono::seconds(1), IPC::InterruptWaitingIfSyncMessageArrives);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcessProxy::sendProcessWillSuspend()
</del><ins>+void WebProcessProxy::sendPrepareToSuspend()
</ins><span class="cx"> {
</span><span class="cx"> if (canSendMessage())
</span><del>- send(Messages::WebProcess::ProcessWillSuspend(), 0);
</del><ins>+ send(Messages::WebProcess::PrepareToSuspend(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcessProxy::sendCancelProcessWillSuspend()
</del><ins>+void WebProcessProxy::sendCancelPrepareToSuspend()
</ins><span class="cx"> {
</span><span class="cx"> if (canSendMessage())
</span><del>- send(Messages::WebProcess::CancelProcessWillSuspend(), 0);
</del><ins>+ send(Messages::WebProcess::CancelPrepareToSuspend(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::initializeNetworkProcessActivityToken()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (184325 => 184326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-05-14 01:34:08 UTC (rev 184325)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-05-14 03:07:25 UTC (rev 184326)
</span><span class="lines">@@ -207,8 +207,8 @@
</span><span class="cx">
</span><span class="cx"> // ProcessThrottlerClient
</span><span class="cx"> void sendProcessWillSuspendImminently() override;
</span><del>- void sendProcessWillSuspend() override;
- void sendCancelProcessWillSuspend() override;
</del><ins>+ void sendPrepareToSuspend() override;
+ void sendCancelPrepareToSuspend() override;
</ins><span class="cx"> void sendProcessDidResume() override;
</span><span class="cx">
</span><span class="cx"> // ProcessLauncher::Client
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (184325 => 184326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-05-14 01:34:08 UTC (rev 184325)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-05-14 03:07:25 UTC (rev 184326)
</span><span class="lines">@@ -1218,7 +1218,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void WebProcess::prepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend shouldAcknowledgeWhenReadyToSuspend)
</del><ins>+void WebProcess::actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend shouldAcknowledgeWhenReadyToSuspend)
</ins><span class="cx"> {
</span><span class="cx"> MemoryPressureHandler::singleton().releaseMemory(true);
</span><span class="cx"> setAllLayerTreeStatesFrozen(true);
</span><span class="lines">@@ -1235,16 +1235,16 @@
</span><span class="cx"> void WebProcess::processWillSuspendImminently(bool& handled)
</span><span class="cx"> {
</span><span class="cx"> supplement<WebDatabaseManager>()->closeAllDatabases();
</span><del>- prepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend::No);
</del><ins>+ actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend::No);
</ins><span class="cx"> handled = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcess::processWillSuspend()
</del><ins>+void WebProcess::prepareToSuspend()
</ins><span class="cx"> {
</span><del>- prepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend::Yes);
</del><ins>+ actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend::Yes);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcess::cancelProcessWillSuspend()
</del><ins>+void WebProcess::cancelPrepareToSuspend()
</ins><span class="cx"> {
</span><span class="cx"> setAllLayerTreeStatesFrozen(false);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (184325 => 184326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-05-14 01:34:08 UTC (rev 184325)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-05-14 03:07:25 UTC (rev 184326)
</span><span class="lines">@@ -185,8 +185,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void processWillSuspendImminently(bool& handled);
</span><del>- void processWillSuspend();
- void cancelProcessWillSuspend();
</del><ins>+ void prepareToSuspend();
+ void cancelPrepareToSuspend();
</ins><span class="cx"> bool markAllLayersVolatileIfPossible();
</span><span class="cx"> void setAllLayerTreeStatesFrozen(bool);
</span><span class="cx"> void processSuspensionCleanupTimerFired();
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx"> void setInjectedBundleParameter(const String& key, const IPC::DataReference&);
</span><span class="cx">
</span><span class="cx"> enum class ShouldAcknowledgeWhenReadyToSuspend { No, Yes };
</span><del>- void prepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend);
</del><ins>+ void actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend);
</ins><span class="cx">
</span><span class="cx"> // ChildProcess
</span><span class="cx"> virtual void initializeProcess(const ChildProcessInitializationParameters&) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (184325 => 184326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2015-05-14 01:34:08 UTC (rev 184325)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2015-05-14 03:07:25 UTC (rev 184326)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ProcessWillSuspendImminently() -> (bool handled)
</span><del>- ProcessWillSuspend()
- CancelProcessWillSuspend()
</del><ins>+ PrepareToSuspend()
+ CancelPrepareToSuspend()
</ins><span class="cx"> ProcessDidResume()
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>