<!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>[180773] trunk</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/180773">180773</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-02-27 12:14:22 -0800 (Fri, 27 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add infrastructure for handling website data in the network process
https://bugs.webkit.org/show_bug.cgi?id=142092
Reviewed by Andreas Kling.
Source/WebKit2:
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::fetchWebsiteData):
(WebKit::NetworkProcess::deleteWebsiteDataForOrigins):
Send back "Did" messages without actually doing anything for now.
* NetworkProcess/NetworkProcess.h:
Add new members.
* NetworkProcess/NetworkProcess.messages.in:
Add FetchWebsiteData and DeleteWebsiteDataForOrigins messages.
* UIProcess/Network/NetworkProcessProxy.cpp:
(WebKit::NetworkProcessProxy::~NetworkProcessProxy):
Assert that all maps are empty.
(WebKit::NetworkProcessProxy::fetchWebsiteData):
(WebKit::NetworkProcessProxy::deleteWebsiteDataForOrigins):
Add callbacks and send fetch and delete messages respectively.
(WebKit::NetworkProcessProxy::networkProcessCrashedOrFailedToLaunch):
Make sure to invoke all callbacks.
(WebKit::NetworkProcessProxy::didFetchWebsiteData):
Find the callback and invoke it.
(WebKit::NetworkProcessProxy::didDeleteWebsiteDataForOrigins):
Ditto.
* UIProcess/Network/NetworkProcessProxy.h:
Add new members.
* UIProcess/Network/NetworkProcessProxy.messages.in:
Add DidFetchWebsiteData and DidDeleteWebsiteDataForOrigins messages.
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::connectionDidClose):
Just pass an empty WebsiteData object.
Tools:
Add a menu item that will fetch all website data, delete the returned data records, and
fetch all website data again so we can confirm that it's all empty.
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController fetchAndClearWebsiteData:]):</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="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxymessagesin">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacMainMenuxib">trunk/Tools/MiniBrowser/mac/MainMenu.xib</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (180772 => 180773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-02-27 19:52:11 UTC (rev 180772)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-27 20:14:22 UTC (rev 180773)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2015-02-27 Anders Carlsson <andersca@apple.com>
+
+ Add infrastructure for handling website data in the network process
+ https://bugs.webkit.org/show_bug.cgi?id=142092
+
+ Reviewed by Andreas Kling.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::fetchWebsiteData):
+ (WebKit::NetworkProcess::deleteWebsiteDataForOrigins):
+ Send back "Did" messages without actually doing anything for now.
+
+ * NetworkProcess/NetworkProcess.h:
+ Add new members.
+
+ * NetworkProcess/NetworkProcess.messages.in:
+ Add FetchWebsiteData and DeleteWebsiteDataForOrigins messages.
+
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::~NetworkProcessProxy):
+ Assert that all maps are empty.
+
+ (WebKit::NetworkProcessProxy::fetchWebsiteData):
+ (WebKit::NetworkProcessProxy::deleteWebsiteDataForOrigins):
+ Add callbacks and send fetch and delete messages respectively.
+
+ (WebKit::NetworkProcessProxy::networkProcessCrashedOrFailedToLaunch):
+ Make sure to invoke all callbacks.
+
+ (WebKit::NetworkProcessProxy::didFetchWebsiteData):
+ Find the callback and invoke it.
+
+ (WebKit::NetworkProcessProxy::didDeleteWebsiteDataForOrigins):
+ Ditto.
+
+ * UIProcess/Network/NetworkProcessProxy.h:
+ Add new members.
+
+ * UIProcess/Network/NetworkProcessProxy.messages.in:
+ Add DidFetchWebsiteData and DidDeleteWebsiteDataForOrigins messages.
+
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::connectionDidClose):
+ Just pass an empty WebsiteData object.
+
</ins><span class="cx"> 2015-02-26 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] REGRESSION(r180465): WebKit::WebPage::editorState() triggers a layout.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (180772 => 180773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-02-27 19:52:11 UTC (rev 180772)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-02-27 20:14:22 UTC (rev 180773)
</span><span class="lines">@@ -39,11 +39,12 @@
</span><span class="cx"> #include "NetworkProcessProxyMessages.h"
</span><span class="cx"> #include "NetworkResourceLoader.h"
</span><span class="cx"> #include "RemoteNetworkingContext.h"
</span><ins>+#include "SecurityOriginData.h"
</ins><span class="cx"> #include "SessionTracker.h"
</span><span class="cx"> #include "StatisticsData.h"
</span><span class="cx"> #include "WebCookieManager.h"
</span><span class="cx"> #include "WebProcessPoolMessages.h"
</span><del>-#include "WebsiteDataTypes.h"
</del><ins>+#include "WebsiteData.h"
</ins><span class="cx"> #include <WebCore/Logging.h>
</span><span class="cx"> #include <WebCore/MemoryPressureHandler.h>
</span><span class="cx"> #include <WebCore/PlatformCookieJar.h>
</span><span class="lines">@@ -240,8 +241,16 @@
</span><span class="cx"> SessionTracker::destroySession(sessionID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcess::deleteWebsiteData(WebCore::SessionID sessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
</del><ins>+void NetworkProcess::fetchWebsiteData(SessionID sessionID, uint64_t websiteDataTypes, uint64_t callbackID)
</ins><span class="cx"> {
</span><ins>+ // FIXME: Actually return data.
+ WebsiteData websiteData;
+
+ parentProcessConnection()->send(Messages::NetworkProcessProxy::DidFetchWebsiteData(callbackID, websiteData), 0);
+}
+
+void NetworkProcess::deleteWebsiteData(SessionID sessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
+{
</ins><span class="cx"> if (websiteDataTypes & WebsiteDataTypeCookies) {
</span><span class="cx"> if (auto* networkStorageSession = SessionTracker::session(sessionID))
</span><span class="cx"> deleteAllCookiesModifiedSince(*networkStorageSession, modifiedSince);
</span><span class="lines">@@ -259,6 +268,17 @@
</span><span class="cx"> completionHandler();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkProcess::deleteWebsiteDataForOrigins(SessionID sessionID, uint64_t websiteDataTypes, const Vector<SecurityOriginData>& origins, uint64_t callbackID)
+{
+ // FIXME: Actually delete something.
+
+ auto completionHandler = [this, callbackID] {
+ parentProcessConnection()->send(Messages::NetworkProcessProxy::DidDeleteWebsiteDataForOrigins(callbackID), 0);
+ };
+
+ completionHandler();
+}
+
</ins><span class="cx"> void NetworkProcess::downloadRequest(uint64_t downloadID, const ResourceRequest& request)
</span><span class="cx"> {
</span><span class="cx"> downloadManager().startDownload(downloadID, request);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (180772 => 180773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-02-27 19:52:11 UTC (rev 180772)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-02-27 20:14:22 UTC (rev 180773)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> class NetworkConnectionToWebProcess;
</span><span class="cx"> class NetworkProcessSupplement;
</span><span class="cx"> struct NetworkProcessCreationParameters;
</span><ins>+struct SecurityOriginData;
</ins><span class="cx">
</span><span class="cx"> class NetworkProcess : public ChildProcess, private DownloadManager::Client {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(NetworkProcess);
</span><span class="lines">@@ -120,7 +121,9 @@
</span><span class="cx"> void ensurePrivateBrowsingSession(WebCore::SessionID);
</span><span class="cx"> void destroyPrivateBrowsingSession(WebCore::SessionID);
</span><span class="cx">
</span><ins>+ void fetchWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, uint64_t callbackID);
</ins><span class="cx"> void deleteWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
</span><ins>+ void deleteWebsiteDataForOrigins(WebCore::SessionID, uint64_t websiteDataTypes, const Vector<SecurityOriginData>& origins, uint64_t callbackID);
</ins><span class="cx">
</span><span class="cx"> // FIXME: This should take a session ID so we can identify which disk cache to delete.
</span><span class="cx"> void clearDiskCache(std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in (180772 => 180773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2015-02-27 19:52:11 UTC (rev 180772)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2015-02-27 20:14:22 UTC (rev 180773)
</span><span class="lines">@@ -37,7 +37,9 @@
</span><span class="cx"> EnsurePrivateBrowsingSession(WebCore::SessionID sessionID)
</span><span class="cx"> DestroyPrivateBrowsingSession(WebCore::SessionID sessionID)
</span><span class="cx">
</span><ins>+ FetchWebsiteData(WebCore::SessionID sessionID, uint64_t websiteDataTypes, uint64_t callbackID)
</ins><span class="cx"> DeleteWebsiteData(WebCore::SessionID sessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
</span><ins>+ DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, uint64_t websiteDataTypes, Vector<WebKit::SecurityOriginData> origins, uint64_t callbackID)
</ins><span class="cx">
</span><span class="cx"> DownloadRequest(uint64_t downloadID, WebCore::ResourceRequest request)
</span><span class="cx"> ResumeDownload(uint64_t downloadID, IPC::DataReference resumeData, String path, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (180772 => 180773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2015-02-27 19:52:11 UTC (rev 180772)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2015-02-27 20:14:22 UTC (rev 180773)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "NetworkProcessMessages.h"
</span><span class="cx"> #include "WebProcessMessages.h"
</span><span class="cx"> #include "WebProcessPool.h"
</span><ins>+#include "WebsiteData.h"
</ins><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SEC_ITEM_SHIM)
</span><span class="lines">@@ -73,7 +74,9 @@
</span><span class="cx">
</span><span class="cx"> NetworkProcessProxy::~NetworkProcessProxy()
</span><span class="cx"> {
</span><ins>+ ASSERT(m_pendingFetchWebsiteDataCallbacks.isEmpty());
</ins><span class="cx"> ASSERT(m_pendingDeleteWebsiteDataCallbacks.isEmpty());
</span><ins>+ ASSERT(m_pendingDeleteWebsiteDataForOriginsCallbacks.isEmpty());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
</span><span class="lines">@@ -111,6 +114,16 @@
</span><span class="cx"> return m_downloadProxyMap->createDownloadProxy(m_processPool, resourceRequest);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkProcessProxy::fetchWebsiteData(SessionID sessionID, WebsiteDataTypes dataTypes, std::function<void (WebsiteData)> completionHandler)
+{
+ ASSERT(canSendMessage());
+
+ uint64_t callbackID = generateCallbackID();
+ m_pendingFetchWebsiteDataCallbacks.add(callbackID, WTF::move(completionHandler));
+
+ send(Messages::WebProcess::FetchWebsiteData(sessionID, dataTypes, callbackID), 0);
+}
+
</ins><span class="cx"> void NetworkProcessProxy::deleteWebsiteData(WebCore::SessionID sessionID, WebsiteDataTypes dataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
</span><span class="cx"> {
</span><span class="cx"> auto callbackID = generateCallbackID();
</span><span class="lines">@@ -119,6 +132,20 @@
</span><span class="cx"> send(Messages::NetworkProcess::DeleteWebsiteData(sessionID, dataTypes, modifiedSince, callbackID), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkProcessProxy::deleteWebsiteDataForOrigins(SessionID sessionID, WebsiteDataTypes dataTypes, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()> completionHandler)
+{
+ ASSERT(canSendMessage());
+
+ uint64_t callbackID = generateCallbackID();
+ m_pendingDeleteWebsiteDataForOriginsCallbacks.add(callbackID, WTF::move(completionHandler));
+
+ Vector<SecurityOriginData> originData;
+ for (auto& origin : origins)
+ originData.append(SecurityOriginData::fromSecurityOrigin(*origin));
+
+ send(Messages::WebProcess::DeleteWebsiteDataForOrigins(sessionID, dataTypes, originData, callbackID), 0);
+}
+
</ins><span class="cx"> void NetworkProcessProxy::networkProcessCrashedOrFailedToLaunch()
</span><span class="cx"> {
</span><span class="cx"> // The network process must have crashed or exited, send any pending sync replies we might have.
</span><span class="lines">@@ -134,10 +161,18 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ for (const auto& callback : m_pendingFetchWebsiteDataCallbacks.values())
+ callback(WebsiteData());
+ m_pendingFetchWebsiteDataCallbacks.clear();
+
</ins><span class="cx"> for (const auto& callback : m_pendingDeleteWebsiteDataCallbacks.values())
</span><span class="cx"> callback();
</span><span class="cx"> m_pendingDeleteWebsiteDataCallbacks.clear();
</span><span class="cx">
</span><ins>+ for (const auto& callback : m_pendingDeleteWebsiteDataForOriginsCallbacks.values())
+ callback();
+ m_pendingDeleteWebsiteDataForOriginsCallbacks.clear();
+
</ins><span class="cx"> // Tell the network process manager to forget about this network process proxy. This may cause us to be deleted.
</span><span class="cx"> m_processPool.networkProcessCrashed(this);
</span><span class="cx"> }
</span><span class="lines">@@ -199,12 +234,24 @@
</span><span class="cx"> page->didReceiveAuthenticationChallengeProxy(frameID, authenticationChallenge.release());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkProcessProxy::didFetchWebsiteData(uint64_t callbackID, const WebsiteData& websiteData)
+{
+ auto callback = m_pendingFetchWebsiteDataCallbacks.take(callbackID);
+ callback(websiteData);
+}
+
</ins><span class="cx"> void NetworkProcessProxy::didDeleteWebsiteData(uint64_t callbackID)
</span><span class="cx"> {
</span><span class="cx"> auto callback = m_pendingDeleteWebsiteDataCallbacks.take(callbackID);
</span><span class="cx"> callback();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkProcessProxy::didDeleteWebsiteDataForOrigins(uint64_t callbackID)
+{
+ auto callback = m_pendingDeleteWebsiteDataForOriginsCallbacks.take(callbackID);
+ callback();
+}
+
</ins><span class="cx"> void NetworkProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Connection::Identifier connectionIdentifier)
</span><span class="cx"> {
</span><span class="cx"> ChildProcessProxy::didFinishLaunching(launcher, connectionIdentifier);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h (180772 => 180773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2015-02-27 19:52:11 UTC (rev 180772)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2015-02-27 20:14:22 UTC (rev 180773)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class AuthenticationChallenge;
</span><span class="cx"> class ResourceRequest;
</span><ins>+class SecurityOrigin;
</ins><span class="cx"> class SessionID;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -62,7 +63,9 @@
</span><span class="cx">
</span><span class="cx"> DownloadProxy* createDownloadProxy(const WebCore::ResourceRequest&);
</span><span class="cx">
</span><ins>+ void fetchWebsiteData(WebCore::SessionID, WebsiteDataTypes, std::function<void (WebsiteData)> completionHandler);
</ins><span class="cx"> void deleteWebsiteData(WebCore::SessionID, WebsiteDataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
</span><ins>+ void deleteWebsiteDataForOrigins(WebCore::SessionID, WebsiteDataTypes, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()> completionHandler);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void setProcessSuppressionEnabled(bool);
</span><span class="lines">@@ -90,7 +93,9 @@
</span><span class="cx"> void didReceiveNetworkProcessProxyMessage(IPC::Connection&, IPC::MessageDecoder&);
</span><span class="cx"> void didCreateNetworkConnectionToWebProcess(const IPC::Attachment&);
</span><span class="cx"> void didReceiveAuthenticationChallenge(uint64_t pageID, uint64_t frameID, const WebCore::AuthenticationChallenge&, uint64_t challengeID);
</span><ins>+ void didFetchWebsiteData(uint64_t callbackID, const WebsiteData&);
</ins><span class="cx"> void didDeleteWebsiteData(uint64_t callbackID);
</span><ins>+ void didDeleteWebsiteDataForOrigins(uint64_t callbackID);
</ins><span class="cx"> void logDiagnosticMessage(uint64_t pageID, const String& message, const String& description, bool shouldSample);
</span><span class="cx"> void logDiagnosticMessageWithResult(uint64_t pageID, const String& message, const String& description, uint32_t result, bool shouldSample);
</span><span class="cx"> void logDiagnosticMessageWithValue(uint64_t pageID, const String& message, const String& description, const String& value, bool shouldSample);
</span><span class="lines">@@ -103,7 +108,9 @@
</span><span class="cx"> unsigned m_numPendingConnectionRequests;
</span><span class="cx"> Deque<RefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>> m_pendingConnectionReplies;
</span><span class="cx">
</span><ins>+ HashMap<uint64_t, std::function<void (WebsiteData)>> m_pendingFetchWebsiteDataCallbacks;
</ins><span class="cx"> HashMap<uint64_t, std::function<void ()>> m_pendingDeleteWebsiteDataCallbacks;
</span><ins>+ HashMap<uint64_t, std::function<void ()>> m_pendingDeleteWebsiteDataForOriginsCallbacks;
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<DownloadProxyMap> m_downloadProxyMap;
</span><span class="cx"> CustomProtocolManagerProxy m_customProtocolManagerProxy;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in (180772 => 180773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in 2015-02-27 19:52:11 UTC (rev 180772)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in 2015-02-27 20:14:22 UTC (rev 180773)
</span><span class="lines">@@ -27,7 +27,9 @@
</span><span class="cx">
</span><span class="cx"> DidReceiveAuthenticationChallenge(uint64_t pageID, uint64_t frameID, WebCore::AuthenticationChallenge challenge, uint64_t challengeID)
</span><span class="cx">
</span><ins>+ DidFetchWebsiteData(uint64_t callbackID, struct WebKit::WebsiteData websiteData)
</ins><span class="cx"> DidDeleteWebsiteData(uint64_t callbackID)
</span><ins>+ DidDeleteWebsiteDataForOrigins(uint64_t callbackID)
</ins><span class="cx">
</span><span class="cx"> # Diagnostic messages logging
</span><span class="cx"> LogDiagnosticMessage(uint64_t pageID, String message, String description, bool shouldSample)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (180772 => 180773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-02-27 19:52:11 UTC (rev 180772)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-02-27 20:14:22 UTC (rev 180773)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> ASSERT(this->connection() == &connection);
</span><span class="cx">
</span><span class="cx"> for (const auto& callback : m_pendingFetchWebsiteDataCallbacks.values())
</span><del>- callback({Vector<WebsiteData::Entry>()});
</del><ins>+ callback(WebsiteData());
</ins><span class="cx"> m_pendingFetchWebsiteDataCallbacks.clear();
</span><span class="cx">
</span><span class="cx"> for (const auto& callback : m_pendingDeleteWebsiteDataCallbacks.values())
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (180772 => 180773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-02-27 19:52:11 UTC (rev 180772)
+++ trunk/Tools/ChangeLog 2015-02-27 20:14:22 UTC (rev 180773)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-02-27 Anders Carlsson <andersca@apple.com>
+
+ Add infrastructure for handling website data in the network process
+ https://bugs.webkit.org/show_bug.cgi?id=142092
+
+ Reviewed by Andreas Kling.
+
+ Add a menu item that will fetch all website data, delete the returned data records, and
+ fetch all website data again so we can confirm that it's all empty.
+
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController fetchAndClearWebsiteData:]):
+
</ins><span class="cx"> 2015-02-26 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Remove remaining SafariTheme cruft
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacMainMenuxib"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/MainMenu.xib (180772 => 180773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/MainMenu.xib 2015-02-27 19:52:11 UTC (rev 180772)
+++ trunk/Tools/MiniBrowser/mac/MainMenu.xib 2015-02-27 20:14:22 UTC (rev 180773)
</span><span class="lines">@@ -469,6 +469,12 @@
</span><span class="cx"> <action selector="clearWebsiteData:" target="-1" id="pEC-gb-vGm"/>
</span><span class="cx"> </connections>
</span><span class="cx"> </menuItem>
</span><ins>+ <menuItem title="Fetch And Clear Website Data" id="VDP-iU-836">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <connections>
+ <action selector="fetchAndClearWebsiteData:" target="-1" id="R06-l2-tP0"/>
+ </connections>
+ </menuItem>
</ins><span class="cx"> </items>
</span><span class="cx"> </menu>
</span><span class="cx"> </menuItem>
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (180772 => 180773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2015-02-27 19:52:11 UTC (rev 180772)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2015-02-27 20:14:22 UTC (rev 180773)
</span><span class="lines">@@ -414,6 +414,17 @@
</span><span class="cx"> }];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (IBAction)fetchAndClearWebsiteData:(id)sender
+{
+ [_configuration._websiteDataStore fetchDataRecordsOfTypes:WKWebsiteDataTypeAll completionHandler:^(NSArray *websiteDataRecords) {
+ [_configuration._websiteDataStore removeDataOfTypes:WKWebsiteDataTypeAll forDataRecords:websiteDataRecords completionHandler:^{
+ [_configuration._websiteDataStore fetchDataRecordsOfTypes:WKWebsiteDataTypeAll completionHandler:^(NSArray *websiteDataRecords) {
+ NSLog(@"did clear website data, after clearing data is %@.", websiteDataRecords);
+ }];
+ }];
+ }];
+}
+
</ins><span class="cx"> - (IBAction)clearWebsiteData:(id)sender
</span><span class="cx"> {
</span><span class="cx"> [_configuration._websiteDataStore removeDataOfTypes:WKWebsiteDataTypeAll modifiedSince:[NSDate distantPast] completionHandler:^{
</span></span></pre>
</div>
</div>
</body>
</html>