Diff
Modified: trunk/Source/WebKit2/ChangeLog (204280 => 204281)
--- trunk/Source/WebKit2/ChangeLog 2016-08-09 15:51:48 UTC (rev 204280)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-09 16:26:28 UTC (rev 204281)
@@ -1,5 +1,41 @@
2016-08-08 Anders Carlsson <ander...@apple.com>
+ Move plug-in code from WebPlatformStrategies to WebPluginInfoProvider
+ https://bugs.webkit.org/show_bug.cgi?id=160679
+
+ Reviewed by Alex Christensen.
+
+ * WebProcess/Plugins/WebPluginInfoProvider.cpp:
+ (WebKit::WebPluginInfoProvider::setPluginLoadClientPolicy):
+ (WebKit::WebPluginInfoProvider::clearPluginClientPolicies):
+ (WebKit::WebPluginInfoProvider::refreshPlugins):
+ (WebKit::WebPluginInfoProvider::getPluginInfo):
+ (WebKit::WebPluginInfoProvider::getWebVisiblePluginInfo):
+ (WebKit::WebPluginInfoProvider::populatePluginCache):
+ (WebKit::WebPluginInfoProvider::pluginLoadClientPolicyForHost):
+ (WebKit::WebPluginInfoProvider::longestMatchedWildcardHostForHost):
+ (WebKit::WebPluginInfoProvider::replaceHostWithMatchedWildcardHost):
+ * WebProcess/Plugins/WebPluginInfoProvider.h:
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::createPluginStrategy):
+ (WebKit::WebPlatformStrategies::WebPlatformStrategies): Deleted.
+ (WebKit::WebPlatformStrategies::refreshPlugins): Deleted.
+ (WebKit::WebPlatformStrategies::getPluginInfo): Deleted.
+ (WebKit::WebPlatformStrategies::getWebVisiblePluginInfo): Deleted.
+ (WebKit::WebPlatformStrategies::setPluginLoadClientPolicy): Deleted.
+ (WebKit::WebPlatformStrategies::clearPluginClientPolicies): Deleted.
+ (WebKit::WebPlatformStrategies::longestMatchedWildcardHostForHost): Deleted.
+ (WebKit::WebPlatformStrategies::replaceHostWithMatchedWildcardHost): Deleted.
+ (WebKit::WebPlatformStrategies::pluginLoadClientPolicyForHost): Deleted.
+ (WebKit::WebPlatformStrategies::populatePluginCache): Deleted.
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess):
+ (WebKit::WebProcess::setPluginLoadClientPolicy):
+ (WebKit::WebProcess::clearPluginClientPolicies):
+
+2016-08-08 Anders Carlsson <ander...@apple.com>
+
Add a new PluginInfoProvider class, to replace PluginStrategy
https://bugs.webkit.org/show_bug.cgi?id=160670
Modified: trunk/Source/WebKit2/WebProcess/Plugins/WebPluginInfoProvider.cpp (204280 => 204281)
--- trunk/Source/WebKit2/WebProcess/Plugins/WebPluginInfoProvider.cpp 2016-08-09 15:51:48 UTC (rev 204280)
+++ trunk/Source/WebKit2/WebProcess/Plugins/WebPluginInfoProvider.cpp 2016-08-09 16:26:28 UTC (rev 204281)
@@ -26,10 +26,22 @@
#include "config.h"
#include "WebPluginInfoProvider.h"
-// FIXME: We shouldn't call out to the platform strategy for this.
-#include "WebPlatformStrategies.h"
-#include <WebCore/PluginStrategy.h>
+#include "HangDetectionDisabler.h"
+#include "WebCoreArgumentCoders.h"
+#include "WebProcess.h"
+#include "WebProcessProxyMessages.h"
+#include <WebCore/Document.h>
+#include <WebCore/DocumentLoader.h>
+#include <WebCore/MainFrame.h>
+#include <WebCore/Page.h>
+#include <WebCore/SecurityOrigin.h>
+#include <WebCore/SubframeLoader.h>
+#include <wtf/text/StringHash.h>
+#if PLATFORM(MAC)
+#include "StringUtilities.h"
+#endif
+
namespace WebKit {
WebPluginInfoProvider& WebPluginInfoProvider::singleton()
@@ -47,31 +59,191 @@
{
}
+#if PLATFORM(MAC)
+void WebPluginInfoProvider::setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy clientPolicy, const String& host, const String& bundleIdentifier, const String& versionString)
+{
+ String hostToSet = host.isNull() || !host.length() ? "*" : host;
+ String bundleIdentifierToSet = bundleIdentifier.isNull() || !bundleIdentifier.length() ? "*" : bundleIdentifier;
+ String versionStringToSet = versionString.isNull() || !versionString.length() ? "*" : versionString;
+
+ PluginPolicyMapsByIdentifier policiesByIdentifier;
+ if (m_hostsToPluginIdentifierData.contains(hostToSet))
+ policiesByIdentifier = m_hostsToPluginIdentifierData.get(hostToSet);
+
+ PluginLoadClientPoliciesByBundleVersion versionsToPolicies;
+ if (policiesByIdentifier.contains(bundleIdentifierToSet))
+ versionsToPolicies = policiesByIdentifier.get(bundleIdentifierToSet);
+
+ versionsToPolicies.set(versionStringToSet, clientPolicy);
+ policiesByIdentifier.set(bundleIdentifierToSet, versionsToPolicies);
+ m_hostsToPluginIdentifierData.set(hostToSet, policiesByIdentifier);
+}
+
+void WebPluginInfoProvider::clearPluginClientPolicies()
+{
+ m_hostsToPluginIdentifierData.clear();
+}
+#endif
+
void WebPluginInfoProvider::refreshPlugins()
{
- WebCore::platformStrategies()->pluginStrategy()->refreshPlugins();
+#if ENABLE(NETSCAPE_PLUGIN_API)
+ m_cachedPlugins.clear();
+ m_pluginCacheIsPopulated = false;
+ m_shouldRefreshPlugins = true;
+#endif
}
void WebPluginInfoProvider::getPluginInfo(WebCore::Page& page, Vector<WebCore::PluginInfo>& plugins)
{
- WebCore::platformStrategies()->pluginStrategy()->getPluginInfo(&page, plugins);
+#if ENABLE(NETSCAPE_PLUGIN_API)
+ populatePluginCache(page);
+
+ if (page.mainFrame().loader().subframeLoader().allowPlugins()) {
+ plugins = m_cachedPlugins;
+ return;
+ }
+
+ plugins = m_cachedApplicationPlugins;
+#else
+ UNUSED_PARAM(page);
+ UNUSED_PARAM(plugins);
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
}
void WebPluginInfoProvider::getWebVisiblePluginInfo(WebCore::Page& page, Vector<WebCore::PluginInfo>& plugins)
{
- WebCore::platformStrategies()->pluginStrategy()->getWebVisiblePluginInfo(&page, plugins);
+ ASSERT_ARG(plugins, plugins.isEmpty());
+
+ getPluginInfo(page, plugins);
+
+#if PLATFORM(MAC)
+ if (auto* document = page.mainFrame().document()) {
+ if (auto* securityOrigin = document->securityOrigin()) {
+ if (securityOrigin->isLocal())
+ return;
+ }
+ }
+
+ for (int32_t i = plugins.size() - 1; i >= 0; --i) {
+ auto& info = plugins.at(i);
+
+ // Allow built-in plugins. Also tentatively allow plugins that the client might later selectively permit.
+ if (info.isApplicationPlugin || info.clientLoadPolicy == WebCore::PluginLoadClientPolicyAsk)
+ continue;
+
+ if (info.clientLoadPolicy == WebCore::PluginLoadClientPolicyBlock)
+ plugins.remove(i);
+ }
+#endif
}
+#if ENABLE(NETSCAPE_PLUGIN_API)
+void WebPluginInfoProvider::populatePluginCache(const WebCore::Page& page)
+{
+ if (!m_pluginCacheIsPopulated) {
+ HangDetectionDisabler hangDetectionDisabler;
+
+ if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetPlugins(m_shouldRefreshPlugins), Messages::WebProcessProxy::GetPlugins::Reply(m_cachedPlugins, m_cachedApplicationPlugins), 0))
+ return;
+
+ m_shouldRefreshPlugins = false;
+ m_pluginCacheIsPopulated = true;
+ }
+
#if PLATFORM(MAC)
-void WebPluginInfoProvider::setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy pluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString)
+ String pageHost = page.mainFrame().loader().documentLoader()->responseURL().host();
+ for (auto& info : m_cachedPlugins) {
+ if (auto clientPolicy = pluginLoadClientPolicyForHost(pageHost, info))
+ info.clientLoadPolicy = *clientPolicy;
+ }
+#else
+ UNUSED_PARAM(page);
+#endif // not PLATFORM(MAC)
+}
+#endif
+
+#if PLATFORM(MAC)
+Optional<WebCore::PluginLoadClientPolicy> WebPluginInfoProvider::pluginLoadClientPolicyForHost(const String& host, const WebCore::PluginInfo& info) const
{
- WebCore::platformStrategies()->pluginStrategy()->setPluginLoadClientPolicy(pluginLoadClientPolicy, host, bundleIdentifier, versionString);
+ String hostToLookUp = host;
+ String identifier = info.bundleIdentifier;
+
+ auto policiesByIdentifierIterator = m_hostsToPluginIdentifierData.find(hostToLookUp);
+
+ if (!identifier.isNull() && policiesByIdentifierIterator == m_hostsToPluginIdentifierData.end()) {
+ if (!replaceHostWithMatchedWildcardHost(hostToLookUp, identifier))
+ hostToLookUp = "*";
+ policiesByIdentifierIterator = m_hostsToPluginIdentifierData.find(hostToLookUp);
+ if (hostToLookUp != "*" && policiesByIdentifierIterator == m_hostsToPluginIdentifierData.end()) {
+ hostToLookUp = "*";
+ policiesByIdentifierIterator = m_hostsToPluginIdentifierData.find(hostToLookUp);
+ }
+ }
+ if (policiesByIdentifierIterator == m_hostsToPluginIdentifierData.end())
+ return Nullopt;
+
+ auto& policiesByIdentifier = policiesByIdentifierIterator->value;
+
+ if (!identifier)
+ identifier = "*";
+
+ auto identifierPolicyIterator = policiesByIdentifier.find(identifier);
+ if (identifier != "*" && identifierPolicyIterator == policiesByIdentifier.end()) {
+ identifier = "*";
+ identifierPolicyIterator = policiesByIdentifier.find(identifier);
+ }
+
+ if (identifierPolicyIterator == policiesByIdentifier.end())
+ return Nullopt;
+
+ auto& versionsToPolicies = identifierPolicyIterator->value;
+
+ String version = info.versionString;
+ if (!version)
+ version = "*";
+ auto policyIterator = versionsToPolicies.find(version);
+ if (version != "*" && policyIterator == versionsToPolicies.end()) {
+ version = "*";
+ policyIterator = versionsToPolicies.find(version);
+ }
+
+ if (policyIterator == versionsToPolicies.end())
+ return Nullopt;
+
+ return policyIterator->value;
}
-void WebPluginInfoProvider::clearPluginClientPolicies()
+String WebPluginInfoProvider::longestMatchedWildcardHostForHost(const String& host) const
{
- WebCore::platformStrategies()->pluginStrategy()->clearPluginClientPolicies();
+ String longestMatchedHost;
+
+ for (auto& key : m_hostsToPluginIdentifierData.keys()) {
+ if (key.contains('*') && key != "*" && stringMatchesWildcardString(host, key)) {
+ if (key.length() > longestMatchedHost.length())
+ longestMatchedHost = key;
+ else if (key.length() == longestMatchedHost.length() && codePointCompareLessThan(key, longestMatchedHost))
+ longestMatchedHost = key;
+ }
+ }
+
+ return longestMatchedHost;
}
+
+bool WebPluginInfoProvider::replaceHostWithMatchedWildcardHost(String& host, const String& identifier) const
+{
+ String matchedWildcardHost = longestMatchedWildcardHostForHost(host);
+
+ if (matchedWildcardHost.isNull())
+ return false;
+
+ auto plugInIdentifierData = m_hostsToPluginIdentifierData.find(matchedWildcardHost);
+ if (plugInIdentifierData == m_hostsToPluginIdentifierData.end() || !plugInIdentifierData->value.contains(identifier))
+ return false;
+
+ host = matchedWildcardHost;
+ return true;
+}
#endif
}
Modified: trunk/Source/WebKit2/WebProcess/Plugins/WebPluginInfoProvider.h (204280 => 204281)
--- trunk/Source/WebKit2/WebProcess/Plugins/WebPluginInfoProvider.h 2016-08-09 15:51:48 UTC (rev 204280)
+++ trunk/Source/WebKit2/WebProcess/Plugins/WebPluginInfoProvider.h 2016-08-09 16:26:28 UTC (rev 204281)
@@ -26,6 +26,7 @@
#pragma once
#include <WebCore/PluginInfoProvider.h>
+#include <wtf/HashMap.h>
namespace WebKit {
@@ -36,16 +37,38 @@
static WebPluginInfoProvider& singleton();
virtual ~WebPluginInfoProvider();
+#if PLATFORM(MAC)
+ void setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString) override;
+ void clearPluginClientPolicies() override;
+#endif
+
private:
+ WebPluginInfoProvider();
+
void refreshPlugins() override;
void getPluginInfo(WebCore::Page&, Vector<WebCore::PluginInfo>&) override;
void getWebVisiblePluginInfo(WebCore::Page&, Vector<WebCore::PluginInfo>&) override;
+
+#if ENABLE(NETSCAPE_PLUGIN_API)
+ void populatePluginCache(const WebCore::Page&);
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
+
#if PLATFORM(MAC)
- void setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString) override;
- void clearPluginClientPolicies() override;
+ Optional<WebCore::PluginLoadClientPolicy> pluginLoadClientPolicyForHost(const String&, const WebCore::PluginInfo&) const;
+ String longestMatchedWildcardHostForHost(const String& host) const;
+ bool replaceHostWithMatchedWildcardHost(String& host, const String& identifier) const;
+
+ typedef HashMap<String, WebCore::PluginLoadClientPolicy> PluginLoadClientPoliciesByBundleVersion;
+ typedef HashMap<String, PluginLoadClientPoliciesByBundleVersion> PluginPolicyMapsByIdentifier;
+ HashMap<String, PluginPolicyMapsByIdentifier> m_hostsToPluginIdentifierData;
#endif
- WebPluginInfoProvider();
+#if ENABLE(NETSCAPE_PLUGIN_API)
+ bool m_pluginCacheIsPopulated { false };
+ bool m_shouldRefreshPlugins { false };
+ Vector<WebCore::PluginInfo> m_cachedPlugins;
+ Vector<WebCore::PluginInfo> m_cachedApplicationPlugins;
+#endif
};
}
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (204280 => 204281)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2016-08-09 15:51:48 UTC (rev 204280)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2016-08-09 16:26:28 UTC (rev 204281)
@@ -80,10 +80,6 @@
}
WebPlatformStrategies::WebPlatformStrategies()
-#if ENABLE(NETSCAPE_PLUGIN_API)
- : m_pluginCacheIsPopulated(false)
- , m_shouldRefreshPlugins(false)
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
{
}
@@ -104,7 +100,7 @@
PluginStrategy* WebPlatformStrategies::createPluginStrategy()
{
- return this;
+ return nullptr;
}
BlobRegistry* WebPlatformStrategies::createBlobRegistry()
@@ -165,200 +161,6 @@
WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::AddCookie(SessionTracker::sessionID(session), url, cookie), 0);
}
-// PluginStrategy
-
-void WebPlatformStrategies::refreshPlugins()
-{
-#if ENABLE(NETSCAPE_PLUGIN_API)
- m_cachedPlugins.clear();
- m_pluginCacheIsPopulated = false;
- m_shouldRefreshPlugins = true;
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-}
-
-void WebPlatformStrategies::getPluginInfo(const WebCore::Page* page, Vector<WebCore::PluginInfo>& plugins)
-{
-#if ENABLE(NETSCAPE_PLUGIN_API)
- ASSERT_ARG(page, page);
- populatePluginCache(*page);
-
- if (page->mainFrame().loader().subframeLoader().allowPlugins()) {
- plugins = m_cachedPlugins;
- return;
- }
-
- plugins = m_cachedApplicationPlugins;
-#else
- UNUSED_PARAM(page);
- UNUSED_PARAM(plugins);
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-}
-
-void WebPlatformStrategies::getWebVisiblePluginInfo(const Page* page, Vector<PluginInfo>& plugins)
-{
- ASSERT_ARG(page, page);
- ASSERT_ARG(plugins, plugins.isEmpty());
-
- getPluginInfo(page, plugins);
-
-#if PLATFORM(MAC)
- if (Document* document = page->mainFrame().document()) {
- if (SecurityOrigin* securityOrigin = document->securityOrigin()) {
- if (securityOrigin->isLocal())
- return;
- }
- }
-
- for (int32_t i = plugins.size() - 1; i >= 0; --i) {
- PluginInfo& info = plugins.at(i);
- PluginLoadClientPolicy clientPolicy = info.clientLoadPolicy;
- // Allow built-in plugins. Also tentatively allow plugins that the client might later selectively permit.
- if (info.isApplicationPlugin || clientPolicy == PluginLoadClientPolicyAsk)
- continue;
-
- if (clientPolicy == PluginLoadClientPolicyBlock)
- plugins.remove(i);
- }
-#endif
-}
-
-#if PLATFORM(MAC)
-void WebPlatformStrategies::setPluginLoadClientPolicy(PluginLoadClientPolicy clientPolicy, const String& host, const String& bundleIdentifier, const String& versionString)
-{
- String hostToSet = host.isNull() || !host.length() ? "*" : host;
- String bundleIdentifierToSet = bundleIdentifier.isNull() || !bundleIdentifier.length() ? "*" : bundleIdentifier;
- String versionStringToSet = versionString.isNull() || !versionString.length() ? "*" : versionString;
-
- PluginPolicyMapsByIdentifier policiesByIdentifier;
- if (m_hostsToPluginIdentifierData.contains(hostToSet))
- policiesByIdentifier = m_hostsToPluginIdentifierData.get(hostToSet);
-
- PluginLoadClientPoliciesByBundleVersion versionsToPolicies;
- if (policiesByIdentifier.contains(bundleIdentifierToSet))
- versionsToPolicies = policiesByIdentifier.get(bundleIdentifierToSet);
-
- versionsToPolicies.set(versionStringToSet, clientPolicy);
- policiesByIdentifier.set(bundleIdentifierToSet, versionsToPolicies);
- m_hostsToPluginIdentifierData.set(hostToSet, policiesByIdentifier);
-}
-
-void WebPlatformStrategies::clearPluginClientPolicies()
-{
- m_hostsToPluginIdentifierData.clear();
-}
-
-#endif
-
-#if ENABLE(NETSCAPE_PLUGIN_API)
-#if PLATFORM(MAC)
-
-String WebPlatformStrategies::longestMatchedWildcardHostForHost(const String& host) const
-{
- String longestMatchedHost;
-
- for (auto& key : m_hostsToPluginIdentifierData.keys()) {
- if (key.contains('*') && key != "*" && stringMatchesWildcardString(host, key)) {
- if (key.length() > longestMatchedHost.length())
- longestMatchedHost = key;
- else if (key.length() == longestMatchedHost.length() && codePointCompareLessThan(key, longestMatchedHost))
- longestMatchedHost = key;
- }
- }
-
- return longestMatchedHost;
-}
-
-bool WebPlatformStrategies::replaceHostWithMatchedWildcardHost(String& host, const String& identifier) const
-{
- String matchedWildcardHost = longestMatchedWildcardHostForHost(host);
-
- if (matchedWildcardHost.isNull())
- return false;
-
- auto plugInIdentifierData = m_hostsToPluginIdentifierData.find(matchedWildcardHost);
- if (plugInIdentifierData == m_hostsToPluginIdentifierData.end() || !plugInIdentifierData->value.contains(identifier))
- return false;
-
- host = matchedWildcardHost;
- return true;
-}
-
-bool WebPlatformStrategies::pluginLoadClientPolicyForHost(const String& host, const PluginInfo& info, PluginLoadClientPolicy& policy) const
-{
- String hostToLookUp = host;
- String identifier = info.bundleIdentifier;
-
- auto policiesByIdentifierIterator = m_hostsToPluginIdentifierData.find(hostToLookUp);
-
- if (!identifier.isNull() && policiesByIdentifierIterator == m_hostsToPluginIdentifierData.end()) {
- if (!replaceHostWithMatchedWildcardHost(hostToLookUp, identifier))
- hostToLookUp = "*";
- policiesByIdentifierIterator = m_hostsToPluginIdentifierData.find(hostToLookUp);
- if (hostToLookUp != "*" && policiesByIdentifierIterator == m_hostsToPluginIdentifierData.end()) {
- hostToLookUp = "*";
- policiesByIdentifierIterator = m_hostsToPluginIdentifierData.find(hostToLookUp);
- }
- }
- if (policiesByIdentifierIterator == m_hostsToPluginIdentifierData.end())
- return false;
-
- auto& policiesByIdentifier = policiesByIdentifierIterator->value;
-
- if (!identifier)
- identifier = "*";
-
- auto identifierPolicyIterator = policiesByIdentifier.find(identifier);
- if (identifier != "*" && identifierPolicyIterator == policiesByIdentifier.end()) {
- identifier = "*";
- identifierPolicyIterator = policiesByIdentifier.find(identifier);
- }
- if (identifierPolicyIterator == policiesByIdentifier.end())
- return false;
-
- auto& versionsToPolicies = identifierPolicyIterator->value;
-
- String version = info.versionString;
- if (!version)
- version = "*";
- auto policyIterator = versionsToPolicies.find(version);
- if (version != "*" && policyIterator == versionsToPolicies.end()) {
- version = "*";
- policyIterator = versionsToPolicies.find(version);
- }
-
- if (policyIterator == versionsToPolicies.end())
- return false;
-
- policy = policyIterator->value;
- return true;
-}
-#endif // PLATFORM(MAC)
-
-void WebPlatformStrategies::populatePluginCache(const WebCore::Page& page)
-{
- if (!m_pluginCacheIsPopulated) {
- HangDetectionDisabler hangDetectionDisabler;
-
- if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetPlugins(m_shouldRefreshPlugins), Messages::WebProcessProxy::GetPlugins::Reply(m_cachedPlugins, m_cachedApplicationPlugins), 0))
- return;
-
- m_shouldRefreshPlugins = false;
- m_pluginCacheIsPopulated = true;
- }
-
-#if PLATFORM(MAC)
- String pageHost = page.mainFrame().loader().documentLoader()->responseURL().host();
- for (PluginInfo& info : m_cachedPlugins) {
- PluginLoadClientPolicy clientPolicy;
- if (pluginLoadClientPolicyForHost(pageHost, info, clientPolicy))
- info.clientLoadPolicy = clientPolicy;
- }
-#else
- UNUSED_PARAM(page);
-#endif // not PLATFORM(MAC)
-}
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
#if PLATFORM(COCOA)
// PasteboardStrategy
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h (204280 => 204281)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2016-08-09 15:51:48 UTC (rev 204280)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2016-08-09 16:26:28 UTC (rev 204281)
@@ -30,13 +30,12 @@
#include <WebCore/LoaderStrategy.h>
#include <WebCore/PasteboardStrategy.h>
#include <WebCore/PlatformStrategies.h>
-#include <WebCore/PluginStrategy.h>
#include <wtf/HashMap.h>
#include <wtf/NeverDestroyed.h>
namespace WebKit {
-class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::PasteboardStrategy, private WebCore::PluginStrategy {
+class WebPlatformStrategies : public WebCore::PlatformStrategies, private WebCore::CookiesStrategy, private WebCore::PasteboardStrategy {
friend class NeverDestroyed<WebPlatformStrategies>;
public:
static void initialize();
@@ -61,19 +60,6 @@
void deleteCookie(const WebCore::NetworkStorageSession&, const WebCore::URL&, const String&) override;
void addCookie(const WebCore::NetworkStorageSession&, const WebCore::URL&, const WebCore::Cookie&) override;
- // WebCore::PluginStrategy
- void refreshPlugins() override;
- void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&) override;
- void getWebVisiblePluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&) override;
-
-#if PLATFORM(MAC)
- typedef HashMap<String, WebCore::PluginLoadClientPolicy> PluginLoadClientPoliciesByBundleVersion;
- typedef HashMap<String, PluginLoadClientPoliciesByBundleVersion> PluginPolicyMapsByIdentifier;
-
- void setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString) override;
- void clearPluginClientPolicies() override;
-#endif
-
// WebCore::PasteboardStrategy
#if PLATFORM(IOS)
void writeToPasteboard(const WebCore::PasteboardWebContent&) override;
@@ -103,27 +89,8 @@
long setStringForType(const String&, const String& pasteboardType, const String& pasteboardName) override;
#endif
-#if ENABLE(NETSCAPE_PLUGIN_API)
- // WebCore::PluginStrategy implementation.
- void populatePluginCache(const WebCore::Page&);
- bool m_pluginCacheIsPopulated;
- bool m_shouldRefreshPlugins;
- Vector<WebCore::PluginInfo> m_cachedPlugins;
- Vector<WebCore::PluginInfo> m_cachedApplicationPlugins;
-
-#if PLATFORM(MAC)
- HashMap<String, PluginPolicyMapsByIdentifier> m_hostsToPluginIdentifierData;
- bool pluginLoadClientPolicyForHost(const String&, const WebCore::PluginInfo&, WebCore::PluginLoadClientPolicy&) const;
- String longestMatchedWildcardHostForHost(const String& host) const;
- bool replaceHostWithMatchedWildcardHost(String& host, const String& identifier) const;
-#endif // PLATFORM(MAC)
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
};
-#if ENABLE(NETSCAPE_PLUGIN_API)
-void handleDidGetPlugins(uint64_t requestID, const Vector<WebCore::PluginInfo>&, const Vector<WebCore::PluginInfo>& applicationPlugins);
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
} // namespace WebKit
#endif // WebPlatformStrategies_h
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (204280 => 204281)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-08-09 15:51:48 UTC (rev 204280)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-08-09 16:26:28 UTC (rev 204281)
@@ -56,6 +56,7 @@
#include "WebPage.h"
#include "WebPageGroupProxy.h"
#include "WebPlatformStrategies.h"
+#include "WebPluginInfoProvider.h"
#include "WebProcessCreationParameters.h"
#include "WebProcessMessages.h"
#include "WebProcessPoolMessages.h"
@@ -397,7 +398,7 @@
for (auto hostIter = parameters.pluginLoadClientPolicies.begin(); hostIter != parameters.pluginLoadClientPolicies.end(); ++hostIter) {
for (auto bundleIdentifierIter = hostIter->value.begin(); bundleIdentifierIter != hostIter->value.end(); ++bundleIdentifierIter) {
for (auto versionIter = bundleIdentifierIter->value.begin(); versionIter != bundleIdentifierIter->value.end(); ++versionIter)
- platformStrategies()->pluginStrategy()->setPluginLoadClientPolicy(static_cast<PluginLoadClientPolicy>(versionIter->value), hostIter->key, bundleIdentifierIter->key, versionIter->key);
+ WebPluginInfoProvider::singleton().setPluginLoadClientPolicy(static_cast<PluginLoadClientPolicy>(versionIter->value), hostIter->key, bundleIdentifierIter->key, versionIter->key);
}
}
#endif
@@ -915,7 +916,7 @@
void WebProcess::setPluginLoadClientPolicy(uint8_t policy, const String& host, const String& bundleIdentifier, const String& versionString)
{
#if ENABLE(NETSCAPE_PLUGIN_API) && PLATFORM(MAC)
- platformStrategies()->pluginStrategy()->setPluginLoadClientPolicy(static_cast<PluginLoadClientPolicy>(policy), host, bundleIdentifier, versionString);
+ WebPluginInfoProvider::singleton().setPluginLoadClientPolicy(static_cast<PluginLoadClientPolicy>(policy), host, bundleIdentifier, versionString);
#endif
}
@@ -922,7 +923,7 @@
void WebProcess::clearPluginClientPolicies()
{
#if ENABLE(NETSCAPE_PLUGIN_API) && PLATFORM(MAC)
- platformStrategies()->pluginStrategy()->clearPluginClientPolicies();
+ WebPluginInfoProvider::singleton().clearPluginClientPolicies();
#endif
}
