Diff
Modified: trunk/Source/WebKit2/ChangeLog (185444 => 185445)
--- trunk/Source/WebKit2/ChangeLog 2015-06-11 02:01:46 UTC (rev 185444)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-11 02:34:03 UTC (rev 185445)
@@ -1,5 +1,29 @@
2015-06-10 Anders Carlsson <[email protected]>
+ WKWebsiteDataStore should handle removing plug-in data for individual records
+ https://bugs.webkit.org/show_bug.cgi?id=145864
+
+ Reviewed by Beth Dakin.
+
+ * PluginProcess/PluginProcess.cpp:
+ (WebKit::PluginProcess::deleteWebsiteDataForHostNames):
+ * PluginProcess/PluginProcess.h:
+ * PluginProcess/PluginProcess.messages.in:
+ * UIProcess/Plugins/PluginProcessManager.cpp:
+ (WebKit::PluginProcessManager::deleteWebsiteDataForHostNames):
+ * UIProcess/Plugins/PluginProcessManager.h:
+ * UIProcess/Plugins/PluginProcessProxy.cpp:
+ (WebKit::PluginProcessProxy::deleteWebsiteDataForHostNames):
+ (WebKit::PluginProcessProxy::pluginProcessCrashedOrFailedToLaunch):
+ (WebKit::PluginProcessProxy::didFinishLaunching):
+ (WebKit::PluginProcessProxy::didDeleteWebsiteDataForHostNames):
+ * UIProcess/Plugins/PluginProcessProxy.h:
+ * UIProcess/Plugins/PluginProcessProxy.messages.in:
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::removeData):
+
+2015-06-10 Anders Carlsson <[email protected]>
+
WKWebsiteDataStore should handle removing plug-in data
https://bugs.webkit.org/show_bug.cgi?id=145862
Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp (185444 => 185445)
--- trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2015-06-11 02:01:46 UTC (rev 185444)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2015-06-11 02:34:03 UTC (rev 185445)
@@ -229,6 +229,16 @@
parentProcessConnection()->send(Messages::PluginProcessProxy::DidDeleteWebsiteData(callbackID), 0);
}
+void PluginProcess::deleteWebsiteDataForHostNames(const Vector<String>& hostNames, uint64_t callbackID)
+{
+ if (auto* module = netscapePluginModule()) {
+ for (auto& hostName : hostNames)
+ module->clearSiteData(hostName, NP_CLEAR_ALL, std::numeric_limits<uint64_t>::max());
+ }
+
+ parentProcessConnection()->send(Messages::PluginProcessProxy::DidDeleteWebsiteDataForHostNames(callbackID), 0);
+}
+
void PluginProcess::setMinimumLifetime(double lifetime)
{
if (lifetime <= 0.0)
Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.h (185444 => 185445)
--- trunk/Source/WebKit2/PluginProcess/PluginProcess.h 2015-06-11 02:01:46 UTC (rev 185444)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.h 2015-06-11 02:34:03 UTC (rev 185445)
@@ -102,6 +102,7 @@
void getSitesWithData(uint64_t callbackID);
void clearSiteData(const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID);
void deleteWebsiteData(std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
+ void deleteWebsiteDataForHostNames(const Vector<String>& hostNames, uint64_t callbackID);
// AudioHardwareListenerClient
virtual void audioHardwareDidBecomeActive() override;
Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.messages.in (185444 => 185445)
--- trunk/Source/WebKit2/PluginProcess/PluginProcess.messages.in 2015-06-11 02:01:46 UTC (rev 185444)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.messages.in 2015-06-11 02:34:03 UTC (rev 185445)
@@ -40,6 +40,7 @@
ClearSiteData(Vector<String> sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
DeleteWebsiteData(std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
+ DeleteWebsiteDataForHostNames(Vector<String> hostNames, uint64_t callbackID)
SetProcessSuppressionEnabled(bool flag)
#if PLATFORM(COCOA)
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp (185444 => 185445)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp 2015-06-11 02:01:46 UTC (rev 185444)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp 2015-06-11 02:34:03 UTC (rev 185445)
@@ -109,6 +109,12 @@
pluginProcess->deleteWebsiteData(modifiedSince, WTF::move(completionHandler));
}
+void PluginProcessManager::deleteWebsiteDataForHostNames(const PluginModuleInfo& plugin, const Vector<String>& hostNames, std::function<void ()> completionHandler)
+{
+ PluginProcessProxy* pluginProcess = getOrCreatePluginProcess(pluginProcessToken(plugin, PluginProcessTypeNormal, PluginProcessSandboxPolicyNormal));
+ pluginProcess->deleteWebsiteDataForHostNames(hostNames, WTF::move(completionHandler));
+}
+
void PluginProcessManager::clearSiteData(const PluginModuleInfo& plugin, WebPluginSiteDataManager* webPluginSiteDataManager, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
{
PluginProcessProxy* pluginProcess = getOrCreatePluginProcess(pluginProcessToken(plugin, PluginProcessTypeNormal, PluginProcessSandboxPolicyNormal));
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h (185444 => 185445)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h 2015-06-11 02:01:46 UTC (rev 185444)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h 2015-06-11 02:34:03 UTC (rev 185445)
@@ -64,6 +64,7 @@
void fetchWebsiteData(const PluginModuleInfo&, std::function<void (Vector<String>)> completionHandler);
void deleteWebsiteData(const PluginModuleInfo&, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
+ void deleteWebsiteDataForHostNames(const PluginModuleInfo&, const Vector<String>& hostNames, std::function<void ()> completionHandler);
void clearSiteData(const PluginModuleInfo&, WebPluginSiteDataManager*, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID);
#if PLATFORM(COCOA)
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp (185444 => 185445)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2015-06-11 02:01:46 UTC (rev 185444)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2015-06-11 02:34:03 UTC (rev 185445)
@@ -136,6 +136,19 @@
m_connection->send(Messages::PluginProcess::DeleteWebsiteData(modifiedSince, callbackID), 0);
}
+void PluginProcessProxy::deleteWebsiteDataForHostNames(const Vector<String>& hostNames, std::function<void ()> completionHandler)
+{
+ uint64_t callbackID = generateCallbackID();
+ m_pendingDeleteWebsiteDataForHostNamesCallbacks.set(callbackID, WTF::move(completionHandler));
+
+ if (state() == State::Launching) {
+ m_pendingDeleteWebsiteDataForHostNamesRequests.append({ hostNames, callbackID });
+ return;
+ }
+
+ m_connection->send(Messages::PluginProcess::DeleteWebsiteDataForHostNames(hostNames, callbackID), 0);
+}
+
void PluginProcessProxy::clearSiteData(WebPluginSiteDataManager* webPluginSiteDataManager, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
{
ASSERT(!m_pendingClearSiteDataReplies.contains(callbackID));
@@ -180,6 +193,11 @@
callback();
m_pendingDeleteWebsiteDataRequests.clear();
+ m_pendingDeleteWebsiteDataForHostNamesRequests.clear();
+ for (const auto& callback : m_pendingDeleteWebsiteDataForHostNamesCallbacks.values())
+ callback();
+ m_pendingDeleteWebsiteDataForHostNamesCallbacks.clear();
+
while (!m_pendingClearSiteDataReplies.isEmpty())
didClearSiteData(m_pendingClearSiteDataReplies.begin()->key);
@@ -247,10 +265,14 @@
m_connection->send(Messages::PluginProcess::GetSitesWithData(callbackID), 0);
m_pendingFetchWebsiteDataRequests.clear();
- for (auto& deleteWebsiteDataRequest : m_pendingDeleteWebsiteDataRequests)
- m_connection->send(Messages::PluginProcess::DeleteWebsiteData(deleteWebsiteDataRequest.modifiedSince, deleteWebsiteDataRequest.callbackID), 0);
+ for (auto& request : m_pendingDeleteWebsiteDataRequests)
+ m_connection->send(Messages::PluginProcess::DeleteWebsiteData(request.modifiedSince, request.callbackID), 0);
m_pendingDeleteWebsiteDataRequests.clear();
+ for (auto& request : m_pendingDeleteWebsiteDataForHostNamesRequests)
+ m_connection->send(Messages::PluginProcess::DeleteWebsiteDataForHostNames(request.hostNames, request.callbackID), 0);
+ m_pendingDeleteWebsiteDataForHostNamesRequests.clear();
+
for (size_t i = 0; i < m_pendingClearSiteDataRequests.size(); ++i) {
const ClearSiteDataRequest& request = m_pendingClearSiteDataRequests[i];
m_connection->send(Messages::PluginProcess::ClearSiteData(request.sites, request.flags, request.maxAgeInSeconds, request.callbackID), 0);
@@ -304,6 +326,12 @@
callback();
}
+void PluginProcessProxy::didDeleteWebsiteDataForHostNames(uint64_t callbackID)
+{
+ auto callback = m_pendingDeleteWebsiteDataForHostNamesCallbacks.take(callbackID);
+ callback();
+}
+
} // namespace WebKit
#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h (185444 => 185445)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2015-06-11 02:01:46 UTC (rev 185444)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2015-06-11 02:34:03 UTC (rev 185445)
@@ -81,6 +81,7 @@
void fetchWebsiteData(std::function<void (Vector<String>)> completionHandler);
void deleteWebsiteData(std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
+ void deleteWebsiteDataForHostNames(const Vector<String>& hostNames, std::function<void ()> completionHandler);
// Asks the plug-in process to clear the data for the given sites.
void clearSiteData(WebPluginSiteDataManager*, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID);
@@ -130,6 +131,7 @@
void didGetSitesWithData(const Vector<String>& sites, uint64_t callbackID);
void didClearSiteData(uint64_t callbackID);
void didDeleteWebsiteData(uint64_t callbackID);
+ void didDeleteWebsiteDataForHostNames(uint64_t callbackID);
#if PLATFORM(COCOA)
bool getPluginProcessSerialNumber(ProcessSerialNumber&);
@@ -175,6 +177,13 @@
Vector<DeleteWebsiteDataRequest> m_pendingDeleteWebsiteDataRequests;
HashMap<uint64_t, std::function<void ()>> m_pendingDeleteWebsiteDataCallbacks;
+ struct DeleteWebsiteDataForHostNamesRequest {
+ Vector<String> hostNames;
+ uint64_t callbackID;
+ };
+ Vector<DeleteWebsiteDataForHostNamesRequest> m_pendingDeleteWebsiteDataForHostNamesRequests;
+ HashMap<uint64_t, std::function<void ()>> m_pendingDeleteWebsiteDataForHostNamesCallbacks;
+
struct ClearSiteDataRequest {
Vector<String> sites;
uint64_t flags;
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in (185444 => 185445)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in 2015-06-11 02:01:46 UTC (rev 185444)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in 2015-06-11 02:34:03 UTC (rev 185445)
@@ -28,6 +28,7 @@
DidGetSitesWithData(Vector<String> sites, uint64_t callbackID)
DidClearSiteData(uint64_t callbackID)
DidDeleteWebsiteData(uint64_t callbackID)
+ DidDeleteWebsiteDataForHostNames(uint64_t callbackID)
#if PLATFORM(COCOA)
SetModalWindowIsShowing(bool modalWindowIsShowing)
Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (185444 => 185445)
--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-06-11 02:01:46 UTC (rev 185444)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-06-11 02:34:03 UTC (rev 185445)
@@ -862,6 +862,62 @@
});
}
+#if ENABLE(NETSCAPE_PLUGIN_API)
+ if (dataTypes & WebsiteDataTypePlugInData && isPersistent()) {
+ Vector<String> hostNames;
+ for (const auto& dataRecord : dataRecords) {
+ for (const auto& hostName : dataRecord.pluginDataHostNames)
+ hostNames.append(hostName);
+ }
+
+
+ class State {
+ public:
+ static void deleteData(Ref<CallbackAggregator>&& callbackAggregator, Vector<PluginModuleInfo>&& plugins, Vector<String>&& hostNames)
+ {
+ new State(WTF::move(callbackAggregator), WTF::move(plugins), WTF::move(hostNames));
+ }
+
+ private:
+ State(Ref<CallbackAggregator>&& callbackAggregator, Vector<PluginModuleInfo>&& plugins, Vector<String>&& hostNames)
+ : m_callbackAggregator(WTF::move(callbackAggregator))
+ , m_plugins(WTF::move(plugins))
+ , m_hostNames(WTF::move(hostNames))
+ {
+ 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().deleteWebsiteDataForHostNames(plugin, m_hostNames, [this] {
+ deleteWebsiteDataForNextPlugin();
+ });
+ }
+
+ Ref<CallbackAggregator> m_callbackAggregator;
+ Vector<PluginModuleInfo> m_plugins;
+ Vector<String> m_hostNames;
+ };
+
+ State::deleteData(*callbackAggregator, plugins(), WTF::move(hostNames));
+ }
+#endif
+
// There's a chance that we don't have any pending callbacks. If so, we want to dispatch the completion handler right away.
callbackAggregator->callIfNeeded();
}
