Diff
Modified: trunk/Source/WebKit2/ChangeLog (204316 => 204317)
--- trunk/Source/WebKit2/ChangeLog 2016-08-10 00:10:24 UTC (rev 204316)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-10 00:31:38 UTC (rev 204317)
@@ -1,3 +1,26 @@
+2016-08-09 Anders Carlsson <ander...@apple.com>
+
+ Remove code that would tell clients whenever the list of installed plug-ins changes
+ https://bugs.webkit.org/show_bug.cgi?id=160719
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/Plugins/PluginInfoStore.cpp:
+ (WebKit::PluginInfoStore::PluginInfoStore): Deleted.
+ (WebKit::PluginInfoStore::loadPluginsIfNecessary): Deleted.
+ * UIProcess/Plugins/PluginInfoStore.h:
+ (WebKit::PluginInfoStoreClient::~PluginInfoStoreClient): Deleted.
+ (WebKit::PluginInfoStoreClient::PluginInfoStoreClient): Deleted.
+ (WebKit::PluginInfoStore::setClient): Deleted.
+ (WebKit::PluginInfoStore::client): Deleted.
+ * UIProcess/WebContextClient.cpp:
+ (WebKit::WebContextClient::plugInInformationBecameAvailable): Deleted.
+ * UIProcess/WebContextClient.h:
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::m_hiddenPageThrottlingTimer): Deleted.
+ (WebKit::WebProcessPool::pluginInfoStoreDidLoadPlugins): Deleted.
+ * UIProcess/WebProcessPool.h:
+
2016-08-09 George Ruan <gr...@apple.com>
Implement functionality of media capture on iOS
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp (204316 => 204317)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp 2016-08-10 00:10:24 UTC (rev 204316)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp 2016-08-10 00:31:38 UTC (rev 204317)
@@ -41,7 +41,6 @@
PluginInfoStore::PluginInfoStore()
: m_pluginListIsUpToDate(false)
- , m_client(0)
{
}
@@ -88,9 +87,6 @@
loadPlugin(m_plugins, pluginPath);
m_pluginListIsUpToDate = true;
-
- if (m_client)
- m_client->pluginInfoStoreDidLoadPlugins(this);
}
void PluginInfoStore::loadPlugin(Vector<PluginModuleInfo>& plugins, const String& pluginPath)
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.h (204316 => 204317)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.h 2016-08-10 00:10:24 UTC (rev 204316)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.h 2016-08-10 00:31:38 UTC (rev 204317)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2010, 2012, 2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -40,15 +40,6 @@
class PluginInfoStore;
-class PluginInfoStoreClient {
- WTF_MAKE_NONCOPYABLE(PluginInfoStoreClient);
-public:
- virtual ~PluginInfoStoreClient() { }
- virtual void pluginInfoStoreDidLoadPlugins(PluginInfoStore*) = 0;
-protected:
- PluginInfoStoreClient() { }
-};
-
class PluginInfoStore {
WTF_MAKE_NONCOPYABLE(PluginInfoStore);
@@ -73,9 +64,6 @@
static PluginModuleLoadPolicy defaultLoadPolicyForPlugin(const PluginModuleInfo&);
- void setClient(PluginInfoStoreClient* client) { m_client = client; }
- PluginInfoStoreClient* client() const { return m_client; }
-
private:
PluginModuleInfo findPluginForMIMEType(const String& mimeType, WebCore::PluginData::AllowedPluginTypes) const;
PluginModuleInfo findPluginForExtension(const String& extension, String& mimeType, WebCore::PluginData::AllowedPluginTypes) const;
@@ -103,7 +91,6 @@
Vector<String> m_additionalPluginsDirectories;
Vector<PluginModuleInfo> m_plugins;
bool m_pluginListIsUpToDate;
- PluginInfoStoreClient* m_client;
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/WebContextClient.cpp (204316 => 204317)
--- trunk/Source/WebKit2/UIProcess/WebContextClient.cpp 2016-08-10 00:10:24 UTC (rev 204316)
+++ trunk/Source/WebKit2/UIProcess/WebContextClient.cpp 2016-08-10 00:31:38 UTC (rev 204317)
@@ -55,17 +55,6 @@
m_client.databaseProcessDidCrash(toAPI(processPool), m_client.base.clientInfo);
}
-void WebContextClient::plugInInformationBecameAvailable(WebProcessPool* processPool, API::Array* plugInInfo)
-{
- if (!m_client.plugInInformationBecameAvailable)
- return;
-
- // FIXME: The API contract expects us to hand a reference to the array here. This is wrong.
- plugInInfo->ref();
-
- m_client.plugInInformationBecameAvailable(toAPI(processPool), toAPI(plugInInfo), m_client.base.clientInfo);
-}
-
PassRefPtr<API::Data> WebContextClient::copyWebCryptoMasterKey(WebProcessPool* processPool)
{
if (!m_client.copyWebCryptoMasterKey)
Modified: trunk/Source/WebKit2/UIProcess/WebContextClient.h (204316 => 204317)
--- trunk/Source/WebKit2/UIProcess/WebContextClient.h 2016-08-10 00:10:24 UTC (rev 204316)
+++ trunk/Source/WebKit2/UIProcess/WebContextClient.h 2016-08-10 00:31:38 UTC (rev 204317)
@@ -48,7 +48,6 @@
void plugInAutoStartOriginHashesChanged(WebProcessPool*);
void networkProcessDidCrash(WebProcessPool*);
void databaseProcessDidCrash(WebProcessPool*);
- void plugInInformationBecameAvailable(WebProcessPool*, API::Array*);
PassRefPtr<API::Data> copyWebCryptoMasterKey(WebProcessPool*);
};
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (204316 => 204317)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-08-10 00:10:24 UTC (rev 204316)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-08-10 00:31:38 UTC (rev 204317)
@@ -212,10 +212,6 @@
WebKit::initializeLogChannelsIfNecessary();
#endif // !LOG_DISABLED
-#if ENABLE(NETSCAPE_PLUGIN_API)
- m_pluginInfoStore.setClient(this);
-#endif
-
#ifndef NDEBUG
processPoolCounter.increment();
#endif
@@ -252,10 +248,6 @@
platformInvalidateContext();
-#if ENABLE(NETSCAPE_PLUGIN_API)
- m_pluginInfoStore.setClient(0);
-#endif
-
#ifndef NDEBUG
processPoolCounter.decrement();
#endif
@@ -1354,43 +1346,6 @@
sendToNetworkingProcess(Messages::CustomProtocolManager::UnregisterScheme(scheme));
}
-#if ENABLE(NETSCAPE_PLUGIN_API)
-void WebProcessPool::pluginInfoStoreDidLoadPlugins(PluginInfoStore* store)
-{
-#ifdef NDEBUG
- UNUSED_PARAM(store);
-#endif
- ASSERT(store == &m_pluginInfoStore);
-
- Vector<PluginModuleInfo> pluginModules = m_pluginInfoStore.plugins();
-
- Vector<RefPtr<API::Object>> plugins;
- plugins.reserveInitialCapacity(pluginModules.size());
-
- for (const auto& pluginModule : pluginModules) {
- API::Dictionary::MapType map;
- map.set(ASCIILiteral("path"), API::String::create(pluginModule.path));
- map.set(ASCIILiteral("name"), API::String::create(pluginModule.info.name));
- map.set(ASCIILiteral("file"), API::String::create(pluginModule.info.file));
- map.set(ASCIILiteral("desc"), API::String::create(pluginModule.info.desc));
-
- Vector<RefPtr<API::Object>> mimeTypes;
- mimeTypes.reserveInitialCapacity(pluginModule.info.mimes.size());
- for (const auto& mimeClassInfo : pluginModule.info.mimes)
- mimeTypes.uncheckedAppend(API::String::create(mimeClassInfo.type));
- map.set(ASCIILiteral("mimes"), API::Array::create(WTFMove(mimeTypes)));
-
-#if PLATFORM(COCOA)
- map.set(ASCIILiteral("bundleId"), API::String::create(pluginModule.bundleIdentifier));
- map.set(ASCIILiteral("version"), API::String::create(pluginModule.versionString));
-#endif
-
- plugins.uncheckedAppend(API::Dictionary::create(WTFMove(map)));
- }
-
- m_client.plugInInformationBecameAvailable(this, API::Array::create(WTFMove(plugins)).ptr());
-}
-
void WebProcessPool::setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy policy, const String& host, const String& bundleIdentifier, const String& versionString)
{
#if ENABLE(NETSCAPE_PLUGIN_API)
@@ -1417,8 +1372,7 @@
#endif
sendToAllProcesses(Messages::WebProcess::ClearPluginClientPolicies());
}
-#endif
-
+
void WebProcessPool::setMemoryCacheDisabled(bool disabled)
{
m_memoryCacheDisabled = disabled;
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (204316 => 204317)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2016-08-10 00:10:24 UTC (rev 204316)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2016-08-10 00:31:38 UTC (rev 204317)
@@ -100,9 +100,6 @@
#endif
class WebProcessPool final : public API::ObjectImpl<API::Object::Type::ProcessPool>, private IPC::MessageReceiver
-#if ENABLE(NETSCAPE_PLUGIN_API)
- , private PluginInfoStoreClient
-#endif
{
public:
static Ref<WebProcessPool> create(API::ProcessPoolConfiguration&);
@@ -433,11 +430,6 @@
void setAnyPageGroupMightHavePrivateBrowsingEnabled(bool);
-#if ENABLE(NETSCAPE_PLUGIN_API)
- // PluginInfoStoreClient:
- void pluginInfoStoreDidLoadPlugins(PluginInfoStore*) override;
-#endif
-
Ref<API::ProcessPoolConfiguration> m_configuration;
IPC::MessageReceiverMap m_messageReceiverMap;
