Diff
Modified: trunk/Source/WebKit2/ChangeLog (185438 => 185439)
--- 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)
@@ -1,3 +1,28 @@
+2015-06-10 Anders Carlsson <[email protected]>
+
+ 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):
+
2015-06-10 Brent Fulgham <[email protected]>
[WK2] Do not indicate Media Keys are present when they are not
Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp (185438 => 185439)
--- 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)
@@ -214,6 +214,21 @@
parentProcessConnection()->send(Messages::PluginProcessProxy::DidClearSiteData(callbackID), 0);
}
+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);
+}
+
void PluginProcess::setMinimumLifetime(double lifetime)
{
if (lifetime <= 0.0)
Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.h (185438 => 185439)
--- 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)
@@ -98,9 +98,11 @@
void didReceivePluginProcessMessage(IPC::Connection&, IPC::MessageDecoder&);
void initializePluginProcess(PluginProcessCreationParameters&&);
void createWebProcessConnection();
+
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);
+
// AudioHardwareListenerClient
virtual void audioHardwareDidBecomeActive() override;
virtual void audioHardwareDidBecomeInactive() override;
Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.messages.in (185438 => 185439)
--- 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)
@@ -39,6 +39,8 @@
# a DidClearSiteData message when done.
ClearSiteData(Vector<String> sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
+ DeleteWebsiteData(std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
+
SetProcessSuppressionEnabled(bool flag)
#if PLATFORM(COCOA)
SetQOS(int latencyQOS, int throughputQOS)
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp (185438 => 185439)
--- 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)
@@ -102,6 +102,13 @@
pluginProcess->fetchWebsiteData(WTF::move(completionHandler));
}
+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));
+}
+
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 (185438 => 185439)
--- 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)
@@ -63,6 +63,7 @@
void removePluginProcessProxy(PluginProcessProxy*);
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 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 (185438 => 185439)
--- 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)
@@ -79,6 +79,8 @@
{
ASSERT(m_pendingFetchWebsiteDataRequests.isEmpty());
ASSERT(m_pendingFetchWebsiteDataCallbacks.isEmpty());
+ ASSERT(m_pendingDeleteWebsiteDataRequests.isEmpty());
+ ASSERT(m_pendingDeleteWebsiteDataCallbacks.isEmpty());
}
void PluginProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
@@ -121,6 +123,19 @@
m_connection->send(Messages::PluginProcess::GetSitesWithData(callbackID), 0);
}
+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);
+}
+
void PluginProcessProxy::clearSiteData(WebPluginSiteDataManager* webPluginSiteDataManager, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
{
ASSERT(!m_pendingClearSiteDataReplies.contains(callbackID));
@@ -156,11 +171,15 @@
}
m_pendingFetchWebsiteDataRequests.clear();
-
for (const auto& callback : m_pendingFetchWebsiteDataCallbacks.values())
callback({ });
m_pendingFetchWebsiteDataCallbacks.clear();
+ m_pendingDeleteWebsiteDataRequests.clear();
+ for (const auto& callback : m_pendingDeleteWebsiteDataCallbacks.values())
+ callback();
+ m_pendingDeleteWebsiteDataRequests.clear();
+
while (!m_pendingClearSiteDataReplies.isEmpty())
didClearSiteData(m_pendingClearSiteDataReplies.begin()->key);
@@ -228,6 +247,10 @@
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);
+ m_pendingDeleteWebsiteDataRequests.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);
@@ -275,6 +298,12 @@
webPluginSiteDataManager->didClearSiteDataForSinglePlugin(callbackID);
}
+void PluginProcessProxy::didDeleteWebsiteData(uint64_t callbackID)
+{
+ auto callback = m_pendingDeleteWebsiteDataCallbacks.take(callbackID);
+ callback();
+}
+
} // namespace WebKit
#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h (185438 => 185439)
--- 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)
@@ -80,6 +80,7 @@
void getPluginProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>);
void fetchWebsiteData(std::function<void (Vector<String>)> completionHandler);
+ void deleteWebsiteData(std::chrono::system_clock::time_point modifiedSince, 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);
@@ -128,6 +129,7 @@
void didCreateWebProcessConnection(const IPC::Attachment&, bool supportsAsynchronousPluginInitialization);
void didGetSitesWithData(const Vector<String>& sites, uint64_t callbackID);
void didClearSiteData(uint64_t callbackID);
+ void didDeleteWebsiteData(uint64_t callbackID);
#if PLATFORM(COCOA)
bool getPluginProcessSerialNumber(ProcessSerialNumber&);
@@ -166,6 +168,13 @@
Vector<uint64_t> m_pendingFetchWebsiteDataRequests;
HashMap<uint64_t, std::function<void (Vector<String>)>> m_pendingFetchWebsiteDataCallbacks;
+ struct DeleteWebsiteDataRequest {
+ std::chrono::system_clock::time_point modifiedSince;
+ uint64_t callbackID;
+ };
+ Vector<DeleteWebsiteDataRequest> m_pendingDeleteWebsiteDataRequests;
+ HashMap<uint64_t, std::function<void ()>> m_pendingDeleteWebsiteDataCallbacks;
+
struct ClearSiteDataRequest {
Vector<String> sites;
uint64_t flags;
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in (185438 => 185439)
--- 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)
@@ -27,6 +27,7 @@
DidGetSitesWithData(Vector<String> sites, uint64_t callbackID)
DidClearSiteData(uint64_t callbackID)
+ DidDeleteWebsiteData(uint64_t callbackID)
#if PLATFORM(COCOA)
SetModalWindowIsShowing(bool modalWindowIsShowing)
Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (185438 => 185439)
--- 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)
@@ -621,6 +621,55 @@
});
}
+#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
+
// 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();
}
