<!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>[185439] 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/185439">185439</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-10 17:27:39 -0700 (Wed, 10 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>WKWebsiteDataStore should handle removing plug-in data
https://bugs.webkit.org/show_bug.cgi?id=145862
Reviewed by Sam Weinig.
* PluginProcess/PluginProcess.cpp:
(WebKit::PluginProcess::deleteWebsiteData):
* PluginProcess/PluginProcess.h:
* PluginProcess/PluginProcess.messages.in:
* UIProcess/Plugins/PluginProcessManager.cpp:
(WebKit::PluginProcessManager::deleteWebsiteData):
* UIProcess/Plugins/PluginProcessManager.h:
* UIProcess/Plugins/PluginProcessProxy.cpp:
(WebKit::PluginProcessProxy::~PluginProcessProxy):
(WebKit::PluginProcessProxy::deleteWebsiteData):
(WebKit::PluginProcessProxy::pluginProcessCrashedOrFailedToLaunch):
(WebKit::PluginProcessProxy::didFinishLaunching):
(WebKit::PluginProcessProxy::didDeleteWebsiteData):
* UIProcess/Plugins/PluginProcessProxy.h:
* UIProcess/Plugins/PluginProcessProxy.messages.in:
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::removeData):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginProcesscpp">trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginProcessh">trunk/Source/WebKit2/PluginProcess/PluginProcess.h</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginProcessmessagesin">trunk/Source/WebKit2/PluginProcess/PluginProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginProcessManagercpp">trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginProcessManagerh">trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginProcessProxycpp">trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginProcessProxyh">trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginProcessProxymessagesin">trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185438 => 185439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-10 23:50:33 UTC (rev 185438)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-11 00:27:39 UTC (rev 185439)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-06-10 Anders Carlsson <andersca@apple.com>
+
+ WKWebsiteDataStore should handle removing plug-in data
+ https://bugs.webkit.org/show_bug.cgi?id=145862
+
+ Reviewed by Sam Weinig.
+
+ * PluginProcess/PluginProcess.cpp:
+ (WebKit::PluginProcess::deleteWebsiteData):
+ * PluginProcess/PluginProcess.h:
+ * PluginProcess/PluginProcess.messages.in:
+ * UIProcess/Plugins/PluginProcessManager.cpp:
+ (WebKit::PluginProcessManager::deleteWebsiteData):
+ * UIProcess/Plugins/PluginProcessManager.h:
+ * UIProcess/Plugins/PluginProcessProxy.cpp:
+ (WebKit::PluginProcessProxy::~PluginProcessProxy):
+ (WebKit::PluginProcessProxy::deleteWebsiteData):
+ (WebKit::PluginProcessProxy::pluginProcessCrashedOrFailedToLaunch):
+ (WebKit::PluginProcessProxy::didFinishLaunching):
+ (WebKit::PluginProcessProxy::didDeleteWebsiteData):
+ * UIProcess/Plugins/PluginProcessProxy.h:
+ * UIProcess/Plugins/PluginProcessProxy.messages.in:
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::removeData):
+
</ins><span class="cx"> 2015-06-10 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Do not indicate Media Keys are present when they are not
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp (185438 => 185439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2015-06-10 23:50:33 UTC (rev 185438)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2015-06-11 00:27:39 UTC (rev 185439)
</span><span class="lines">@@ -214,6 +214,21 @@
</span><span class="cx"> parentProcessConnection()->send(Messages::PluginProcessProxy::DidClearSiteData(callbackID), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PluginProcess::deleteWebsiteData(std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
+{
+ if (auto* module = netscapePluginModule()) {
+ auto currentTime = std::chrono::system_clock::now();
+
+ if (currentTime > modifiedSince) {
+ uint64_t maximumAge = std::chrono::duration_cast<std::chrono::seconds>(currentTime - modifiedSince).count();
+
+ module->clearSiteData(String(), NP_CLEAR_ALL, maximumAge);
+ }
+ }
+
+ parentProcessConnection()->send(Messages::PluginProcessProxy::DidDeleteWebsiteData(callbackID), 0);
+}
+
</ins><span class="cx"> void PluginProcess::setMinimumLifetime(double lifetime)
</span><span class="cx"> {
</span><span class="cx"> if (lifetime <= 0.0)
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.h (185438 => 185439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginProcess.h 2015-06-10 23:50:33 UTC (rev 185438)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.h 2015-06-11 00:27:39 UTC (rev 185439)
</span><span class="lines">@@ -98,9 +98,11 @@
</span><span class="cx"> void didReceivePluginProcessMessage(IPC::Connection&, IPC::MessageDecoder&);
</span><span class="cx"> void initializePluginProcess(PluginProcessCreationParameters&&);
</span><span class="cx"> void createWebProcessConnection();
</span><ins>+
</ins><span class="cx"> void getSitesWithData(uint64_t callbackID);
</span><span class="cx"> void clearSiteData(const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID);
</span><del>-
</del><ins>+ void deleteWebsiteData(std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
+
</ins><span class="cx"> // AudioHardwareListenerClient
</span><span class="cx"> virtual void audioHardwareDidBecomeActive() override;
</span><span class="cx"> virtual void audioHardwareDidBecomeInactive() override;
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.messages.in (185438 => 185439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginProcess.messages.in 2015-06-10 23:50:33 UTC (rev 185438)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.messages.in 2015-06-11 00:27:39 UTC (rev 185439)
</span><span class="lines">@@ -39,6 +39,8 @@
</span><span class="cx"> # a DidClearSiteData message when done.
</span><span class="cx"> ClearSiteData(Vector<String> sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
</span><span class="cx">
</span><ins>+ DeleteWebsiteData(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>
<a id="trunkSourceWebKit2UIProcessPluginsPluginProcessManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp (185438 => 185439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp 2015-06-10 23:50:33 UTC (rev 185438)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp 2015-06-11 00:27:39 UTC (rev 185439)
</span><span class="lines">@@ -102,6 +102,13 @@
</span><span class="cx"> pluginProcess->fetchWebsiteData(WTF::move(completionHandler));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PluginProcessManager::deleteWebsiteData(const PluginModuleInfo& plugin, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
+{
+ PluginProcessProxy* pluginProcess = getOrCreatePluginProcess(pluginProcessToken(plugin, PluginProcessTypeNormal, PluginProcessSandboxPolicyNormal));
+
+ pluginProcess->deleteWebsiteData(modifiedSince, WTF::move(completionHandler));
+}
+
</ins><span class="cx"> void PluginProcessManager::clearSiteData(const PluginModuleInfo& plugin, WebPluginSiteDataManager* webPluginSiteDataManager, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
</span><span class="cx"> {
</span><span class="cx"> PluginProcessProxy* pluginProcess = getOrCreatePluginProcess(pluginProcessToken(plugin, PluginProcessTypeNormal, PluginProcessSandboxPolicyNormal));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginProcessManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h (185438 => 185439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h 2015-06-10 23:50:33 UTC (rev 185438)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h 2015-06-11 00:27:39 UTC (rev 185439)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> void removePluginProcessProxy(PluginProcessProxy*);
</span><span class="cx">
</span><span class="cx"> void fetchWebsiteData(const PluginModuleInfo&, std::function<void (Vector<String>)> completionHandler);
</span><ins>+ void deleteWebsiteData(const PluginModuleInfo&, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
</ins><span class="cx"> void clearSiteData(const PluginModuleInfo&, WebPluginSiteDataManager*, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp (185438 => 185439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2015-06-10 23:50:33 UTC (rev 185438)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2015-06-11 00:27:39 UTC (rev 185439)
</span><span class="lines">@@ -79,6 +79,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_pendingFetchWebsiteDataRequests.isEmpty());
</span><span class="cx"> ASSERT(m_pendingFetchWebsiteDataCallbacks.isEmpty());
</span><ins>+ ASSERT(m_pendingDeleteWebsiteDataRequests.isEmpty());
+ ASSERT(m_pendingDeleteWebsiteDataCallbacks.isEmpty());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PluginProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
</span><span class="lines">@@ -121,6 +123,19 @@
</span><span class="cx"> m_connection->send(Messages::PluginProcess::GetSitesWithData(callbackID), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PluginProcessProxy::deleteWebsiteData(std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
+{
+ uint64_t callbackID = generateCallbackID();
+ m_pendingDeleteWebsiteDataCallbacks.set(callbackID, WTF::move(completionHandler));
+
+ if (state() == State::Launching) {
+ m_pendingDeleteWebsiteDataRequests.append({ modifiedSince, callbackID });
+ return;
+ }
+
+ m_connection->send(Messages::PluginProcess::DeleteWebsiteData(modifiedSince, callbackID), 0);
+}
+
</ins><span class="cx"> void PluginProcessProxy::clearSiteData(WebPluginSiteDataManager* webPluginSiteDataManager, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_pendingClearSiteDataReplies.contains(callbackID));
</span><span class="lines">@@ -156,11 +171,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_pendingFetchWebsiteDataRequests.clear();
</span><del>-
</del><span class="cx"> for (const auto& callback : m_pendingFetchWebsiteDataCallbacks.values())
</span><span class="cx"> callback({ });
</span><span class="cx"> m_pendingFetchWebsiteDataCallbacks.clear();
</span><span class="cx">
</span><ins>+ m_pendingDeleteWebsiteDataRequests.clear();
+ for (const auto& callback : m_pendingDeleteWebsiteDataCallbacks.values())
+ callback();
+ m_pendingDeleteWebsiteDataRequests.clear();
+
</ins><span class="cx"> while (!m_pendingClearSiteDataReplies.isEmpty())
</span><span class="cx"> didClearSiteData(m_pendingClearSiteDataReplies.begin()->key);
</span><span class="cx">
</span><span class="lines">@@ -228,6 +247,10 @@
</span><span class="cx"> m_connection->send(Messages::PluginProcess::GetSitesWithData(callbackID), 0);
</span><span class="cx"> m_pendingFetchWebsiteDataRequests.clear();
</span><span class="cx">
</span><ins>+ for (auto& deleteWebsiteDataRequest : m_pendingDeleteWebsiteDataRequests)
+ m_connection->send(Messages::PluginProcess::DeleteWebsiteData(deleteWebsiteDataRequest.modifiedSince, deleteWebsiteDataRequest.callbackID), 0);
+ m_pendingDeleteWebsiteDataRequests.clear();
+
</ins><span class="cx"> for (size_t i = 0; i < m_pendingClearSiteDataRequests.size(); ++i) {
</span><span class="cx"> const ClearSiteDataRequest& request = m_pendingClearSiteDataRequests[i];
</span><span class="cx"> m_connection->send(Messages::PluginProcess::ClearSiteData(request.sites, request.flags, request.maxAgeInSeconds, request.callbackID), 0);
</span><span class="lines">@@ -275,6 +298,12 @@
</span><span class="cx"> webPluginSiteDataManager->didClearSiteDataForSinglePlugin(callbackID);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PluginProcessProxy::didDeleteWebsiteData(uint64_t callbackID)
+{
+ auto callback = m_pendingDeleteWebsiteDataCallbacks.take(callbackID);
+ callback();
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h (185438 => 185439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2015-06-10 23:50:33 UTC (rev 185438)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2015-06-11 00:27:39 UTC (rev 185439)
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx"> void getPluginProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>);
</span><span class="cx">
</span><span class="cx"> void fetchWebsiteData(std::function<void (Vector<String>)> completionHandler);
</span><ins>+ void deleteWebsiteData(std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
</ins><span class="cx">
</span><span class="cx"> // Asks the plug-in process to clear the data for the given sites.
</span><span class="cx"> void clearSiteData(WebPluginSiteDataManager*, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID);
</span><span class="lines">@@ -128,6 +129,7 @@
</span><span class="cx"> void didCreateWebProcessConnection(const IPC::Attachment&, bool supportsAsynchronousPluginInitialization);
</span><span class="cx"> void didGetSitesWithData(const Vector<String>& sites, uint64_t callbackID);
</span><span class="cx"> void didClearSiteData(uint64_t callbackID);
</span><ins>+ void didDeleteWebsiteData(uint64_t callbackID);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> bool getPluginProcessSerialNumber(ProcessSerialNumber&);
</span><span class="lines">@@ -166,6 +168,13 @@
</span><span class="cx"> Vector<uint64_t> m_pendingFetchWebsiteDataRequests;
</span><span class="cx"> HashMap<uint64_t, std::function<void (Vector<String>)>> m_pendingFetchWebsiteDataCallbacks;
</span><span class="cx">
</span><ins>+ struct DeleteWebsiteDataRequest {
+ std::chrono::system_clock::time_point modifiedSince;
+ uint64_t callbackID;
+ };
+ Vector<DeleteWebsiteDataRequest> m_pendingDeleteWebsiteDataRequests;
+ HashMap<uint64_t, std::function<void ()>> m_pendingDeleteWebsiteDataCallbacks;
+
</ins><span class="cx"> struct ClearSiteDataRequest {
</span><span class="cx"> Vector<String> sites;
</span><span class="cx"> uint64_t flags;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginProcessProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in (185438 => 185439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in 2015-06-10 23:50:33 UTC (rev 185438)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in 2015-06-11 00:27:39 UTC (rev 185439)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx">
</span><span class="cx"> DidGetSitesWithData(Vector<String> sites, uint64_t callbackID)
</span><span class="cx"> DidClearSiteData(uint64_t callbackID)
</span><ins>+ DidDeleteWebsiteData(uint64_t callbackID)
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> SetModalWindowIsShowing(bool modalWindowIsShowing)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (185438 => 185439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-06-10 23:50:33 UTC (rev 185438)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-06-11 00:27:39 UTC (rev 185439)
</span><span class="lines">@@ -621,6 +621,55 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
+ if (dataTypes & WebsiteDataTypePlugInData && isPersistent()) {
+ class State {
+ public:
+ static void deleteData(Ref<CallbackAggregator>&& callbackAggregator, Vector<PluginModuleInfo>&& plugins, std::chrono::system_clock::time_point modifiedSince)
+ {
+ new State(WTF::move(callbackAggregator), WTF::move(plugins), modifiedSince);
+ }
+
+ private:
+ State(Ref<CallbackAggregator>&& callbackAggregator, Vector<PluginModuleInfo>&& plugins, std::chrono::system_clock::time_point modifiedSince)
+ : m_callbackAggregator(WTF::move(callbackAggregator))
+ , m_plugins(WTF::move(plugins))
+ , m_modifiedSince(modifiedSince)
+ {
+ m_callbackAggregator->addPendingCallback();
+
+ deleteWebsiteDataForNextPlugin();
+ }
+
+ ~State()
+ {
+ ASSERT(m_plugins.isEmpty());
+ }
+
+ void deleteWebsiteDataForNextPlugin()
+ {
+ if (m_plugins.isEmpty()) {
+ m_callbackAggregator->removePendingCallback();
+
+ delete this;
+ return;
+ }
+
+ auto plugin = m_plugins.takeLast();
+ PluginProcessManager::singleton().deleteWebsiteData(plugin, m_modifiedSince, [this] {
+ deleteWebsiteDataForNextPlugin();
+ });
+ }
+
+ Ref<CallbackAggregator> m_callbackAggregator;
+ Vector<PluginModuleInfo> m_plugins;
+ std::chrono::system_clock::time_point m_modifiedSince;
+ };
+
+ State::deleteData(*callbackAggregator, plugins(), modifiedSince);
+ }
+#endif
+
</ins><span class="cx"> // There's a chance that we don't have any pending callbacks. If so, we want to dispatch the completion handler right away.
</span><span class="cx"> callbackAggregator->callIfNeeded();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>