<!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>[180265] trunk/Source</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/180265">180265</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-02-18 08:31:15 -0800 (Wed, 18 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add API for clearing in-memory caches to WKWebsiteDataStore
https://bugs.webkit.org/show_bug.cgi?id=141724
Reviewed by Tim Horton.
Source/WebCore:
Add a version of evictResources that takes a session id.
* loader/cache/MemoryCache.cpp:
(WebCore::MemoryCache::evictResources):
Source/WebKit2:
* Shared/WebsiteData/WebsiteDataTypes.h:
Add WebsiteDataTypeMemoryCache.
* UIProcess/API/Cocoa/_WKWebsiteDataStore.h:
Add WKWebsiteDataTypeMemoryCache.
* UIProcess/API/Cocoa/_WKWebsiteDataStore.mm:
(toWebsiteDataTypes):
Handle WKWebsiteDataTypeMemoryCache and convert it to WebsiteDataTypeMemoryCache.
* UIProcess/WebProcessProxy.cpp:
(WebKit::generateCallbackID):
Generate a new callback.
(WebKit::WebProcessProxy::~WebProcessProxy):
Assert that we don't have any pending callbacks.
(WebKit::WebProcessProxy::connectionDidClose):
Invoke pending callbacks.
(WebKit::WebProcessProxy::canTerminateChildProcess):
Don't try to terminate if we have pending callbacks.
(WebKit::WebProcessProxy::didDeleteWebsiteData):
Take the callback and invoke it.
(WebKit::WebProcessProxy::deleteWebsiteData):
Send a delete message.
* UIProcess/WebProcessProxy.h:
Add new members.
* UIProcess/WebProcessProxy.messages.in:
Add DidDeleteWebsiteData message.
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::computeNetworkProcessAccessType):
Spell persistent correctly.
(WebKit::computeWebProcessAccessType):
Return a web process access type given the a data type mask.
(WebKit::WebsiteDataStore::removeData):
Ask any associated web processes to remove website data.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::deleteWebsiteData):
Delete the memory cache if requested.
* WebProcess/WebProcess.h:
Add new member.
* WebProcess/WebProcess.messages.in:
Add DeleteWebsiteData message.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCachecpp">trunk/Source/WebCore/loader/cache/MemoryCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCacheh">trunk/Source/WebCore/loader/cache/MemoryCache.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebsiteDataWebsiteDataTypesh">trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoreh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoremm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm</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="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp</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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180264 => 180265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebCore/ChangeLog 2015-02-18 16:31:15 UTC (rev 180265)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-02-17 Anders Carlsson <andersca@apple.com>
+
+ Add API for clearing in-memory caches to WKWebsiteDataStore
+ https://bugs.webkit.org/show_bug.cgi?id=141724
+
+ Reviewed by Tim Horton.
+
+ Add a version of evictResources that takes a session id.
+
+ * loader/cache/MemoryCache.cpp:
+ (WebCore::MemoryCache::evictResources):
+
</ins><span class="cx"> 2015-02-18 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove more references to WebCore.exp.in
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (180264 => 180265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2015-02-18 16:31:15 UTC (rev 180265)
</span><span class="lines">@@ -680,6 +680,22 @@
</span><span class="cx"> setDisabled(false);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MemoryCache::evictResources(SessionID sessionID)
+{
+ if (disabled())
+ return;
+
+ auto it = m_sessionResources.find(sessionID);
+ if (it == m_sessionResources.end())
+ return;
+ auto& resources = *it->value;
+
+ for (int i = 0, size = resources.size(); i < size; ++i)
+ remove(*resources.begin()->value);
+
+ ASSERT(!m_sessionResources.contains(sessionID));
+}
+
</ins><span class="cx"> void MemoryCache::prune()
</span><span class="cx"> {
</span><span class="cx"> if (m_liveSize + m_deadSize <= m_capacity && m_deadSize <= m_maxDeadCapacity) // Fast path.
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.h (180264 => 180265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.h 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.h 2015-02-18 16:31:15 UTC (rev 180265)
</span><span class="lines">@@ -115,6 +115,7 @@
</span><span class="cx"> bool disabled() const { return m_disabled; }
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void evictResources();
</span><ins>+ WEBCORE_EXPORT void evictResources(SessionID);
</ins><span class="cx">
</span><span class="cx"> void prune();
</span><span class="cx"> unsigned size() const { return m_liveSize + m_deadSize; }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (180264 => 180265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-18 16:31:15 UTC (rev 180265)
</span><span class="lines">@@ -1,3 +1,65 @@
</span><ins>+2015-02-17 Anders Carlsson <andersca@apple.com>
+
+ Add API for clearing in-memory caches to WKWebsiteDataStore
+ https://bugs.webkit.org/show_bug.cgi?id=141724
+
+ Reviewed by Tim Horton.
+
+ * Shared/WebsiteData/WebsiteDataTypes.h:
+ Add WebsiteDataTypeMemoryCache.
+
+ * UIProcess/API/Cocoa/_WKWebsiteDataStore.h:
+ Add WKWebsiteDataTypeMemoryCache.
+
+ * UIProcess/API/Cocoa/_WKWebsiteDataStore.mm:
+ (toWebsiteDataTypes):
+ Handle WKWebsiteDataTypeMemoryCache and convert it to WebsiteDataTypeMemoryCache.
+
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::generateCallbackID):
+ Generate a new callback.
+
+ (WebKit::WebProcessProxy::~WebProcessProxy):
+ Assert that we don't have any pending callbacks.
+
+ (WebKit::WebProcessProxy::connectionDidClose):
+ Invoke pending callbacks.
+
+ (WebKit::WebProcessProxy::canTerminateChildProcess):
+ Don't try to terminate if we have pending callbacks.
+
+ (WebKit::WebProcessProxy::didDeleteWebsiteData):
+ Take the callback and invoke it.
+
+ (WebKit::WebProcessProxy::deleteWebsiteData):
+ Send a delete message.
+
+ * UIProcess/WebProcessProxy.h:
+ Add new members.
+
+ * UIProcess/WebProcessProxy.messages.in:
+ Add DidDeleteWebsiteData message.
+
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::computeNetworkProcessAccessType):
+ Spell persistent correctly.
+
+ (WebKit::computeWebProcessAccessType):
+ Return a web process access type given the a data type mask.
+
+ (WebKit::WebsiteDataStore::removeData):
+ Ask any associated web processes to remove website data.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::deleteWebsiteData):
+ Delete the memory cache if requested.
+
+ * WebProcess/WebProcess.h:
+ Add new member.
+
+ * WebProcess/WebProcess.messages.in:
+ Add DeleteWebsiteData message.
+
</ins><span class="cx"> 2015-02-17 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r178595): Clicking on DD highlights sometimes do not work
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebsiteDataWebsiteDataTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h (180264 => 180265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h 2015-02-18 16:31:15 UTC (rev 180265)
</span><span class="lines">@@ -31,7 +31,8 @@
</span><span class="cx"> enum WebsiteDataTypes {
</span><span class="cx"> WebsiteDataTypeCookies = 1 << 0,
</span><span class="cx"> WebsiteDataTypeDiskCache = 1 << 1,
</span><del>- WebsiteDataTypeLocalStorage = 1 << 2,
</del><ins>+ WebsiteDataTypeMemoryCache = 1 << 2,
+ WebsiteDataTypeLocalStorage = 1 << 3,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h (180264 => 180265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h 2015-02-18 16:31:15 UTC (rev 180265)
</span><span class="lines">@@ -32,8 +32,9 @@
</span><span class="cx"> typedef NS_OPTIONS(NSUInteger, WKWebsiteDataTypes) {
</span><span class="cx"> WKWebsiteDataTypeCookies = 1 << 0,
</span><span class="cx"> WKWebsiteDataTypeDiskCache = 1 << 1,
</span><ins>+ WKWebsiteDataTypeMemoryCache = 1 << 2,
</ins><span class="cx">
</span><del>- WKWebsiteDataTypeLocalStorage = 1 << 2,
</del><ins>+ WKWebsiteDataTypeLocalStorage = 1 << 3,
</ins><span class="cx"> WKWebsiteDataTypeAll = NSUIntegerMax,
</span><span class="cx"> } WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm (180264 => 180265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm 2015-02-18 16:31:15 UTC (rev 180265)
</span><span class="lines">@@ -62,6 +62,8 @@
</span><span class="cx"> websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeCookies;
</span><span class="cx"> if (wkWebsiteDataTypes & WKWebsiteDataTypeDiskCache)
</span><span class="cx"> websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeDiskCache;
</span><ins>+ if (wkWebsiteDataTypes & WKWebsiteDataTypeMemoryCache)
+ websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeMemoryCache;
</ins><span class="cx"> if (wkWebsiteDataTypes & WKWebsiteDataTypeLocalStorage)
</span><span class="cx"> websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeLocalStorage;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (180264 => 180265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-02-18 16:31:15 UTC (rev 180265)
</span><span class="lines">@@ -79,6 +79,13 @@
</span><span class="cx"> return ++uniquePageID;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static uint64_t generateCallbackID()
+{
+ static uint64_t callbackID;
+
+ return ++callbackID;
+}
+
</ins><span class="cx"> static WebProcessProxy::WebPageProxyMap& globalPageMap()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="lines">@@ -106,6 +113,8 @@
</span><span class="cx">
</span><span class="cx"> WebProcessProxy::~WebProcessProxy()
</span><span class="cx"> {
</span><ins>+ ASSERT(m_pendingDeleteWebsiteDataCallbacks.isEmpty());
+
</ins><span class="cx"> if (m_webConnection)
</span><span class="cx"> m_webConnection->invalidate();
</span><span class="cx">
</span><span class="lines">@@ -137,6 +146,10 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(this->connection() == &connection);
</span><span class="cx">
</span><ins>+ for (const auto& callback : m_pendingDeleteWebsiteDataCallbacks.values())
+ callback();
+ m_pendingDeleteWebsiteDataCallbacks.clear();
+
</ins><span class="cx"> for (auto& page : m_pageMap.values())
</span><span class="cx"> page->connectionDidClose(connection);
</span><span class="cx"> }
</span><span class="lines">@@ -566,6 +579,9 @@
</span><span class="cx"> if (m_downloadProxyMap && !m_downloadProxyMap->isEmpty())
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (!m_pendingDeleteWebsiteDataCallbacks.isEmpty())
+ return false;
+
</ins><span class="cx"> if (!m_processPool->shouldTerminate(this))
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -581,6 +597,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcessProxy::didDeleteWebsiteData(uint64_t callbackID)
+{
+ auto callback = m_pendingDeleteWebsiteDataCallbacks.take(callbackID);
+ callback();
+}
+
</ins><span class="cx"> void WebProcessProxy::updateTextCheckerState()
</span><span class="cx"> {
</span><span class="cx"> if (canSendMessage())
</span><span class="lines">@@ -616,6 +638,16 @@
</span><span class="cx"> page->viewStateDidChange(ViewState::IsVisuallyIdle);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcessProxy::deleteWebsiteData(SessionID sessionID, WebsiteDataTypes dataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
+{
+ ASSERT(canSendMessage());
+
+ uint64_t callbackID = generateCallbackID();
+
+ m_pendingDeleteWebsiteDataCallbacks.add(callbackID, WTF::move(completionHandler));
+ send(Messages::WebProcess::DeleteWebsiteData(sessionID, dataTypes, modifiedSince, callbackID), 0);
+}
+
</ins><span class="cx"> void WebProcessProxy::requestTermination()
</span><span class="cx"> {
</span><span class="cx"> if (state() != State::Running)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (180264 => 180265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-02-18 16:31:15 UTC (rev 180265)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "WebConnectionToWebProcess.h"
</span><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span><ins>+#include "WebsiteDataTypes.h"
</ins><span class="cx"> #include <WebCore/LinkHash.h>
</span><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -121,6 +122,8 @@
</span><span class="cx"> void didSaveToPageCache();
</span><span class="cx"> void releasePageCache();
</span><span class="cx">
</span><ins>+ void deleteWebsiteData(WebCore::SessionID, WebsiteDataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
+
</ins><span class="cx"> void enableSuddenTermination();
</span><span class="cx"> void disableSuddenTermination();
</span><span class="cx">
</span><span class="lines">@@ -145,7 +148,7 @@
</span><span class="cx"> void setIsHoldingLockedFiles(bool);
</span><span class="cx">
</span><span class="cx"> ProcessThrottler& throttler() { return *m_throttler; }
</span><del>-
</del><ins>+
</ins><span class="cx"> private:
</span><span class="cx"> explicit WebProcessProxy(WebProcessPool&);
</span><span class="cx">
</span><span class="lines">@@ -165,6 +168,8 @@
</span><span class="cx">
</span><span class="cx"> void shouldTerminate(bool& shouldTerminate);
</span><span class="cx">
</span><ins>+ void didDeleteWebsiteData(uint64_t callbackID);
+
</ins><span class="cx"> // Plugins
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> void getPlugins(bool refresh, Vector<WebCore::PluginInfo>& plugins, Vector<WebCore::PluginInfo>& applicationPlugins);
</span><span class="lines">@@ -220,6 +225,8 @@
</span><span class="cx"> std::unique_ptr<DownloadProxyMap> m_downloadProxyMap;
</span><span class="cx"> CustomProtocolManagerProxy m_customProtocolManagerProxy;
</span><span class="cx">
</span><ins>+ HashMap<uint64_t, std::function<void ()>> m_pendingDeleteWebsiteDataCallbacks;
+
</ins><span class="cx"> int m_numberOfTimesSuddenTerminationWasDisabled;
</span><span class="cx"> std::unique_ptr<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 (180264 => 180265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in 2015-02-18 16:31:15 UTC (rev 180265)
</span><span class="lines">@@ -29,6 +29,8 @@
</span><span class="cx"> EnableSuddenTermination()
</span><span class="cx"> DisableSuddenTermination()
</span><span class="cx">
</span><ins>+ DidDeleteWebsiteData(uint64_t callbackID)
+
</ins><span class="cx"> # Plugin messages.
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> GetPlugins(bool refresh) -> (Vector<WebCore::PluginInfo> plugins, Vector<WebCore::PluginInfo> applicationPlugins)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (180264 => 180265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-02-18 16:31:15 UTC (rev 180265)
</span><span class="lines">@@ -95,23 +95,33 @@
</span><span class="cx"> Launch,
</span><span class="cx"> };
</span><span class="cx">
</span><del>-static ProcessAccessType computeNetworkProcessAccessType(WebsiteDataTypes dataTypes, bool isNonPersistantStore)
</del><ins>+static ProcessAccessType computeNetworkProcessAccessType(WebsiteDataTypes dataTypes, bool isNonPersistentStore)
</ins><span class="cx"> {
</span><span class="cx"> ProcessAccessType processAccessType = ProcessAccessType::None;
</span><span class="cx">
</span><span class="cx"> if (dataTypes & WebsiteDataTypeCookies) {
</span><del>- if (isNonPersistantStore)
</del><ins>+ if (isNonPersistentStore)
</ins><span class="cx"> processAccessType = std::max(processAccessType, ProcessAccessType::OnlyIfLaunched);
</span><span class="cx"> else
</span><span class="cx"> processAccessType = std::max(processAccessType, ProcessAccessType::Launch);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeDiskCache && !isNonPersistantStore)
</del><ins>+ if (dataTypes & WebsiteDataTypeDiskCache && !isNonPersistentStore)
</ins><span class="cx"> processAccessType = std::max(processAccessType, ProcessAccessType::Launch);
</span><span class="cx">
</span><span class="cx"> return processAccessType;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static ProcessAccessType computeWebProcessAccessType(WebsiteDataTypes dataTypes, bool isNonPersistentStore)
+{
+ ProcessAccessType processAccessType = ProcessAccessType::None;
+
+ if (dataTypes & WebsiteDataTypeMemoryCache)
+ processAccessType = std::max(processAccessType, ProcessAccessType::OnlyIfLaunched);
+
+ return processAccessType;
+}
+
</ins><span class="cx"> void WebsiteDataStore::removeData(WebsiteDataTypes dataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
</span><span class="cx"> {
</span><span class="cx"> struct CallbackAggregator : public RefCounted<CallbackAggregator> {
</span><span class="lines">@@ -173,6 +183,31 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ auto webProcessAccessType = computeWebProcessAccessType(dataTypes, isNonPersistent());
+ if (webProcessAccessType != ProcessAccessType::None) {
+ for (auto& process : processes()) {
+ switch (webProcessAccessType) {
+ case ProcessAccessType::OnlyIfLaunched:
+ if (!process->canSendMessage())
+ continue;
+ break;
+
+ case ProcessAccessType::Launch:
+ // FIXME: Handle this.
+ ASSERT_NOT_REACHED();
+ break;
+
+ case ProcessAccessType::None:
+ ASSERT_NOT_REACHED();
+ }
+
+ callbackAggregator->addPendingCallback();
+ process->deleteWebsiteData(m_sessionID, dataTypes, modifiedSince, [callbackAggregator] {
+ callbackAggregator->removePendingCallback();
+ });
+ }
+ }
+
</ins><span class="cx"> if (dataTypes & WebsiteDataTypeLocalStorage && m_storageManager) {
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (180264 => 180265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-02-18 16:31:15 UTC (rev 180265)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> #include "WebProcessPoolMessages.h"
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span><span class="cx"> #include "WebResourceCacheManager.h"
</span><ins>+#include "WebsiteDataTypes.h"
</ins><span class="cx"> #include <JavaScriptCore/JSLock.h>
</span><span class="cx"> #include <JavaScriptCore/MemoryStatistics.h>
</span><span class="cx"> #include <WebCore/AXObjectCache.h>
</span><span class="lines">@@ -1131,6 +1132,18 @@
</span><span class="cx"> PageCache::singleton().pruneToSizeNow(0, PruningReason::MemoryPressure);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcess::deleteWebsiteData(SessionID sessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
+{
+ if (websiteDataTypes & WebsiteDataTypeMemoryCache) {
+ PageCache::singleton().pruneToSizeNow(0, PruningReason::None);
+ MemoryCache::singleton().evictResources(sessionID);
+
+ CrossOriginPreflightResultCache::singleton().empty();
+ }
+
+ parentProcessConnection()->send(Messages::WebProcessProxy::DidDeleteWebsiteData(callbackID), 0);
+}
+
</ins><span class="cx"> #if !PLATFORM(COCOA)
</span><span class="cx"> void WebProcess::initializeProcessName(const ChildProcessInitializationParameters&)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (180264 => 180265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-02-18 16:31:15 UTC (rev 180265)
</span><span class="lines">@@ -259,6 +259,8 @@
</span><span class="cx">
</span><span class="cx"> void releasePageCache();
</span><span class="cx">
</span><ins>+ void deleteWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
+
</ins><span class="cx"> #if USE(SOUP)
</span><span class="cx"> void setIgnoreTLSErrors(bool);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (180264 => 180265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2015-02-18 16:31:15 UTC (rev 180265)
</span><span class="lines">@@ -79,6 +79,8 @@
</span><span class="cx">
</span><span class="cx"> ReleasePageCache()
</span><span class="cx">
</span><ins>+ DeleteWebsiteData(WebCore::SessionID sessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
+
</ins><span class="cx"> SetProcessSuppressionEnabled(bool flag)
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> SetQOS(int latencyQOS, int throughputQOS)
</span></span></pre>
</div>
</div>
</body>
</html>