<!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>[205209] 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/205209">205209</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-08-30 17:11:33 -0700 (Tue, 30 Aug 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Switch more messages over to Connection::sendWithReply
https://bugs.webkit.org/show_bug.cgi?id=161415

Reviewed by Tim Horton.

* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::~WebProcessProxy):
(WebKit::WebProcessProxy::processWillShutDown):
(WebKit::WebProcessProxy::canTerminateChildProcess):
(WebKit::WebProcessProxy::deleteWebsiteData):
(WebKit::WebProcessProxy::deleteWebsiteDataForOrigins):
(WebKit::generateCallbackID): Deleted.
(WebKit::WebProcessProxy::didDeleteWebsiteData): Deleted.
(WebKit::WebProcessProxy::didDeleteWebsiteDataForOrigins): Deleted.
* UIProcess/WebProcessProxy.h:
* UIProcess/WebProcessProxy.messages.in:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::deleteWebsiteData):
(WebKit::WebProcess::deleteWebsiteDataForOrigins):
* 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="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxymessagesin">trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in</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 (205208 => 205209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2016-08-30 23:01:13 UTC (rev 205208)
+++ trunk/Source/WebKit2/ChangeLog        2016-08-31 00:11:33 UTC (rev 205209)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2016-08-30  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Switch more messages over to Connection::sendWithReply
+        https://bugs.webkit.org/show_bug.cgi?id=161415
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::~WebProcessProxy):
+        (WebKit::WebProcessProxy::processWillShutDown):
+        (WebKit::WebProcessProxy::canTerminateChildProcess):
+        (WebKit::WebProcessProxy::deleteWebsiteData):
+        (WebKit::WebProcessProxy::deleteWebsiteDataForOrigins):
+        (WebKit::generateCallbackID): Deleted.
+        (WebKit::WebProcessProxy::didDeleteWebsiteData): Deleted.
+        (WebKit::WebProcessProxy::didDeleteWebsiteDataForOrigins): Deleted.
+        * UIProcess/WebProcessProxy.h:
+        * UIProcess/WebProcessProxy.messages.in:
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::deleteWebsiteData):
+        (WebKit::WebProcess::deleteWebsiteDataForOrigins):
+        * WebProcess/WebProcess.h:
+        * WebProcess/WebProcess.messages.in:
+
+2016-08-30  Anders Carlsson  &lt;andersca@apple.com&gt;
+
</ins><span class="cx">         Add Connection::sendWithReply
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=161399
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (205208 => 205209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp        2016-08-30 23:01:13 UTC (rev 205208)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp        2016-08-31 00:11:33 UTC (rev 205209)
</span><span class="lines">@@ -80,13 +80,6 @@
</span><span class="cx">     return ++uniquePageID;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static uint64_t generateCallbackID()
-{
-    static uint64_t callbackID;
-
-    return ++callbackID;
-}
-
</del><span class="cx"> static WebProcessProxy::WebPageProxyMap&amp; globalPageMap()
</span><span class="cx"> {
</span><span class="cx">     ASSERT(RunLoop::isMain());
</span><span class="lines">@@ -115,8 +108,6 @@
</span><span class="cx"> 
</span><span class="cx"> WebProcessProxy::~WebProcessProxy()
</span><span class="cx"> {
</span><del>-    ASSERT(m_pendingDeleteWebsiteDataCallbacks.isEmpty());
-    ASSERT(m_pendingDeleteWebsiteDataForOriginsCallbacks.isEmpty());
</del><span class="cx">     ASSERT(m_pageURLRetainCountMap.isEmpty());
</span><span class="cx"> 
</span><span class="cx">     if (m_webConnection)
</span><span class="lines">@@ -163,14 +154,6 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(connection, this-&gt;connection() == &amp;connection);
</span><span class="cx"> 
</span><del>-    for (const auto&amp; callback : m_pendingDeleteWebsiteDataCallbacks.values())
-        callback();
-    m_pendingDeleteWebsiteDataCallbacks.clear();
-
-    for (const auto&amp; callback : m_pendingDeleteWebsiteDataForOriginsCallbacks.values())
-        callback();
-    m_pendingDeleteWebsiteDataForOriginsCallbacks.clear();
-
</del><span class="cx">     for (auto&amp; page : m_pageMap.values())
</span><span class="cx">         page-&gt;webProcessWillShutDown();
</span><span class="cx"> 
</span><span class="lines">@@ -683,9 +666,6 @@
</span><span class="cx">     if (!m_pageMap.isEmpty())
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><del>-    if (!m_pendingDeleteWebsiteDataCallbacks.isEmpty())
-        return false;
-
</del><span class="cx">     if (!m_processPool-&gt;shouldTerminate(this))
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="lines">@@ -701,18 +681,6 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebProcessProxy::didDeleteWebsiteData(uint64_t callbackID)
-{
-    auto callback = m_pendingDeleteWebsiteDataCallbacks.take(callbackID);
-    callback();
-}
-
-void WebProcessProxy::didDeleteWebsiteDataForOrigins(uint64_t callbackID)
-{
-    auto callback = m_pendingDeleteWebsiteDataForOriginsCallbacks.take(callbackID);
-    callback();
-}
-
</del><span class="cx"> void WebProcessProxy::updateTextCheckerState()
</span><span class="cx"> {
</span><span class="cx">     if (canSendMessage())
</span><span class="lines">@@ -758,15 +726,13 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(canSendMessage());
</span><span class="cx"> 
</span><del>-    uint64_t callbackID = generateCallbackID();
</del><span class="cx">     auto token = throttler().backgroundActivityToken();
</span><span class="cx">     RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), &quot;%p - WebProcessProxy is taking a background assertion because the Web process is deleting Website data&quot;, this);
</span><span class="cx"> 
</span><del>-    m_pendingDeleteWebsiteDataCallbacks.add(callbackID, [this, token, completionHandler, sessionID] {
</del><ins>+    connection()-&gt;sendWithReply(Messages::WebProcess::DeleteWebsiteData(sessionID, dataTypes, modifiedSince), 0, RunLoop::main(), [this, token, completionHandler = WTFMove(completionHandler), sessionID](auto reply) {
</ins><span class="cx">         completionHandler();
</span><span class="cx">         RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), &quot;%p - WebProcessProxy is releasing a background assertion because the Web process is done deleting Website data&quot;, this);
</span><span class="cx">     });
</span><del>-    send(Messages::WebProcess::DeleteWebsiteData(sessionID, dataTypes, modifiedSince, callbackID), 0);
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebProcessProxy::deleteWebsiteDataForOrigins(SessionID sessionID, OptionSet&lt;WebsiteDataType&gt; dataTypes, const Vector&lt;RefPtr&lt;WebCore::SecurityOrigin&gt;&gt;&amp; origins, std::function&lt;void ()&gt; completionHandler)
</span><span class="lines">@@ -773,20 +739,17 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(canSendMessage());
</span><span class="cx"> 
</span><del>-    uint64_t callbackID = generateCallbackID();
</del><span class="cx">     auto token = throttler().backgroundActivityToken();
</span><span class="cx">     RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), &quot;%p - WebProcessProxy is taking a background assertion because the Web process is deleting Website data for several origins&quot;, this);
</span><span class="cx"> 
</span><del>-    m_pendingDeleteWebsiteDataForOriginsCallbacks.add(callbackID, [this, token, completionHandler, sessionID] {
-        completionHandler();
-        RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), &quot;%p - WebProcessProxy is releasing a background assertion because the Web process is done deleting Website data for several origins&quot;, this);
-    });
-
</del><span class="cx">     Vector&lt;SecurityOriginData&gt; originData;
</span><span class="cx">     for (auto&amp; origin : origins)
</span><span class="cx">         originData.append(SecurityOriginData::fromSecurityOrigin(*origin));
</span><span class="cx"> 
</span><del>-    send(Messages::WebProcess::DeleteWebsiteDataForOrigins(sessionID, dataTypes, originData, callbackID), 0);
</del><ins>+    connection()-&gt;sendWithReply(Messages::WebProcess::DeleteWebsiteDataForOrigins(sessionID, dataTypes, originData), 0, RunLoop::main(), [this, token, completionHandler, sessionID](auto reply) {
+        completionHandler();
+        RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), &quot;%p - WebProcessProxy is releasing a background assertion because the Web process is done deleting Website data for several origins&quot;, this);
+    });
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebProcessProxy::requestTermination()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (205208 => 205209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h        2016-08-30 23:01:13 UTC (rev 205208)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h        2016-08-31 00:11:33 UTC (rev 205209)
</span><span class="lines">@@ -170,9 +170,6 @@
</span><span class="cx"> 
</span><span class="cx">     void shouldTerminate(bool&amp; shouldTerminate);
</span><span class="cx"> 
</span><del>-    void didDeleteWebsiteData(uint64_t callbackID);
-    void didDeleteWebsiteDataForOrigins(uint64_t callbackID);
-
</del><span class="cx">     // Plugins
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">     void getPlugins(bool refresh, Vector&lt;WebCore::PluginInfo&gt;&amp; plugins, Vector&lt;WebCore::PluginInfo&gt;&amp; applicationPlugins);
</span><span class="lines">@@ -238,9 +235,6 @@
</span><span class="cx"> 
</span><span class="cx">     CustomProtocolManagerProxy m_customProtocolManagerProxy;
</span><span class="cx"> 
</span><del>-    HashMap&lt;uint64_t, std::function&lt;void ()&gt;&gt; m_pendingDeleteWebsiteDataCallbacks;
-    HashMap&lt;uint64_t, std::function&lt;void ()&gt;&gt; m_pendingDeleteWebsiteDataForOriginsCallbacks;
-
</del><span class="cx">     int m_numberOfTimesSuddenTerminationWasDisabled;
</span><span class="cx">     ProcessThrottler m_throttler;
</span><span class="cx">     ProcessThrottler::BackgroundActivityToken m_tokenForHoldingLockedFiles;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in (205208 => 205209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in        2016-08-30 23:01:13 UTC (rev 205208)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in        2016-08-31 00:11:33 UTC (rev 205209)
</span><span class="lines">@@ -31,9 +31,6 @@
</span><span class="cx">     EnableSuddenTermination()
</span><span class="cx">     DisableSuddenTermination()
</span><span class="cx"> 
</span><del>-    DidDeleteWebsiteData(uint64_t callbackID)
-    DidDeleteWebsiteDataForOrigins(uint64_t callbackID)
-
</del><span class="cx">     # Plugin messages.
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">     GetPlugins(bool refresh) -&gt; (Vector&lt;WebCore::PluginInfo&gt; plugins, Vector&lt;WebCore::PluginInfo&gt; applicationPlugins)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (205208 => 205209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp        2016-08-30 23:01:13 UTC (rev 205208)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp        2016-08-31 00:11:33 UTC (rev 205209)
</span><span class="lines">@@ -1207,7 +1207,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebProcess::deleteWebsiteData(SessionID sessionID, OptionSet&lt;WebsiteDataType&gt; websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
</del><ins>+void WebProcess::deleteWebsiteData(SessionID sessionID, OptionSet&lt;WebsiteDataType&gt; websiteDataTypes, std::chrono::system_clock::time_point modifiedSince)
</ins><span class="cx"> {
</span><span class="cx">     UNUSED_PARAM(modifiedSince);
</span><span class="cx"> 
</span><span class="lines">@@ -1217,11 +1217,9 @@
</span><span class="cx"> 
</span><span class="cx">         CrossOriginPreflightResultCache::singleton().empty();
</span><span class="cx">     }
</span><del>-
-    parentProcessConnection()-&gt;send(Messages::WebProcessProxy::DidDeleteWebsiteData(callbackID), 0);
</del><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebProcess::deleteWebsiteDataForOrigins(WebCore::SessionID sessionID, OptionSet&lt;WebsiteDataType&gt; websiteDataTypes, const Vector&lt;WebCore::SecurityOriginData&gt;&amp; originDatas, uint64_t callbackID)
</del><ins>+void WebProcess::deleteWebsiteDataForOrigins(WebCore::SessionID sessionID, OptionSet&lt;WebsiteDataType&gt; websiteDataTypes, const Vector&lt;WebCore::SecurityOriginData&gt;&amp; originDatas)
</ins><span class="cx"> {
</span><span class="cx">     if (websiteDataTypes.contains(WebsiteDataType::MemoryCache)) {
</span><span class="cx">         HashSet&lt;RefPtr&lt;SecurityOrigin&gt;&gt; origins;
</span><span class="lines">@@ -1230,8 +1228,6 @@
</span><span class="cx"> 
</span><span class="cx">         MemoryCache::singleton().removeResourcesWithOrigins(sessionID, origins);
</span><span class="cx">     }
</span><del>-
-    parentProcessConnection()-&gt;send(Messages::WebProcessProxy::DidDeleteWebsiteDataForOrigins(callbackID), 0);
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebProcess::setHiddenPageTimerThrottlingIncreaseLimit(int milliseconds)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (205208 => 205209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h        2016-08-30 23:01:13 UTC (rev 205208)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h        2016-08-31 00:11:33 UTC (rev 205209)
</span><span class="lines">@@ -288,8 +288,8 @@
</span><span class="cx">     void releasePageCache();
</span><span class="cx"> 
</span><span class="cx">     void fetchWebsiteData(WebCore::SessionID, OptionSet&lt;WebsiteDataType&gt;, WebsiteData&amp;);
</span><del>-    void deleteWebsiteData(WebCore::SessionID, OptionSet&lt;WebsiteDataType&gt;, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
-    void deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet&lt;WebsiteDataType&gt;, const Vector&lt;WebCore::SecurityOriginData&gt;&amp; origins, uint64_t callbackID);
</del><ins>+    void deleteWebsiteData(WebCore::SessionID, OptionSet&lt;WebsiteDataType&gt;, std::chrono::system_clock::time_point modifiedSince);
+    void deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet&lt;WebsiteDataType&gt;, const Vector&lt;WebCore::SecurityOriginData&gt;&amp; origins);
</ins><span class="cx"> 
</span><span class="cx">     void setMemoryCacheDisabled(bool);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (205208 => 205209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in        2016-08-30 23:01:13 UTC (rev 205208)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in        2016-08-31 00:11:33 UTC (rev 205209)
</span><span class="lines">@@ -77,8 +77,8 @@
</span><span class="cx">     ReleasePageCache()
</span><span class="cx"> 
</span><span class="cx">     FetchWebsiteData(WebCore::SessionID sessionID, OptionSet&lt;WebKit::WebsiteDataType&gt; websiteDataTypes) -&gt; (struct WebKit::WebsiteData websiteData)
</span><del>-    DeleteWebsiteData(WebCore::SessionID sessionID, OptionSet&lt;WebKit::WebsiteDataType&gt; websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
-    DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, OptionSet&lt;WebKit::WebsiteDataType&gt; websiteDataTypes, Vector&lt;WebCore::SecurityOriginData&gt; origins, uint64_t callbackID)
</del><ins>+    DeleteWebsiteData(WebCore::SessionID sessionID, OptionSet&lt;WebKit::WebsiteDataType&gt; websiteDataTypes, std::chrono::system_clock::time_point modifiedSince) -&gt; ()
+    DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, OptionSet&lt;WebKit::WebsiteDataType&gt; websiteDataTypes, Vector&lt;WebCore::SecurityOriginData&gt; origins) -&gt; ()
</ins><span class="cx"> 
</span><span class="cx">     SetHiddenPageTimerThrottlingIncreaseLimit(int milliseconds)
</span><span class="cx">     SetProcessSuppressionEnabled(bool flag)
</span></span></pre>
</div>
</div>

</body>
</html>