Diff
Modified: branches/safari-602.1.32-branch/Source/WebCore/ChangeLog (201020 => 201021)
--- branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-17 17:58:57 UTC (rev 201021)
@@ -1,5 +1,19 @@
2016-05-17 Babak Shafiei <[email protected]>
+ Merge r200819. rdar://problem/26235373
+
+ 2016-05-13 Tina Liu <[email protected]>
+
+ Revert r199691.
+ https://bugs.webkit.org/show_bug.cgi?id=157645
+ <rdar://problem/26235373>
+
+ Reviewed by Darin Adler.
+
+ * plugins/PluginStrategy.h:
+
+2016-05-17 Babak Shafiei <[email protected]>
+
Merge r200872. rdar://problem/25993225
2016-05-13 Nan Wang <[email protected]>
Modified: branches/safari-602.1.32-branch/Source/WebCore/plugins/PluginStrategy.h (201020 => 201021)
--- branches/safari-602.1.32-branch/Source/WebCore/plugins/PluginStrategy.h 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebCore/plugins/PluginStrategy.h 2016-05-17 17:58:57 UTC (rev 201021)
@@ -39,7 +39,6 @@
virtual void getWebVisiblePluginInfo(const Page*, Vector<PluginInfo>&) = 0;
#if PLATFORM(MAC)
virtual void setPluginLoadClientPolicy(PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString) = 0;
- virtual void setPrivateBrowsingPluginLoadClientPolicy(PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString) = 0;
virtual void clearPluginClientPolicies() = 0;
#endif
Modified: branches/safari-602.1.32-branch/Source/WebKit/mac/ChangeLog (201020 => 201021)
--- branches/safari-602.1.32-branch/Source/WebKit/mac/ChangeLog 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit/mac/ChangeLog 2016-05-17 17:58:57 UTC (rev 201021)
@@ -1,5 +1,21 @@
2016-05-17 Babak Shafiei <[email protected]>
+ Merge r200819. rdar://problem/26235373
+
+ 2016-05-13 Tina Liu <[email protected]>
+
+ Revert r199691.
+ https://bugs.webkit.org/show_bug.cgi?id=157645
+ <rdar://problem/26235373>
+
+ Reviewed by Darin Adler.
+
+ * WebCoreSupport/WebPlatformStrategies.h:
+ * WebCoreSupport/WebPlatformStrategies.mm:
+ (WebPlatformStrategies::setPrivateBrowsingPluginLoadClientPolicy): Deleted.
+
+2016-05-17 Babak Shafiei <[email protected]>
+
Merge r200866. rdar://problem/26253396
2016-05-13 Beth Dakin <[email protected]>
Modified: branches/safari-602.1.32-branch/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h (201020 => 201021)
--- branches/safari-602.1.32-branch/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h 2016-05-17 17:58:57 UTC (rev 201021)
@@ -64,7 +64,6 @@
void getWebVisiblePluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&) override;
#if PLATFORM(MAC)
void setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String&, const String&, const String&) override;
- void setPrivateBrowsingPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String&, const String&, const String&) override;
void clearPluginClientPolicies() override;
#endif
Modified: branches/safari-602.1.32-branch/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm (201020 => 201021)
--- branches/safari-602.1.32-branch/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm 2016-05-17 17:58:57 UTC (rev 201021)
@@ -150,10 +150,6 @@
{
}
-void WebPlatformStrategies::setPrivateBrowsingPluginLoadClientPolicy(PluginLoadClientPolicy, const String&, const String&, const String&)
-{
-}
-
void WebPlatformStrategies::clearPluginClientPolicies()
{
}
Modified: branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog (201020 => 201021)
--- branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-17 17:58:57 UTC (rev 201021)
@@ -1,5 +1,49 @@
2016-05-17 Babak Shafiei <[email protected]>
+ Merge r200819. rdar://problem/26235373
+
+ 2016-05-13 Tina Liu <[email protected]>
+
+ Revert r199691.
+ https://bugs.webkit.org/show_bug.cgi?id=157645
+ <rdar://problem/26235373>
+
+ Reviewed by Darin Adler.
+
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::encode): Deleted.
+ (WebKit::WebProcessCreationParameters::decode): Deleted.
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/API/C/mac/WKContextPrivateMac.h:
+ * UIProcess/API/C/mac/WKContextPrivateMac.mm:
+ (WKContextSetPrivateBrowsingPluginLoadClientPolicy): Deleted.
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::setPluginLoadClientPolicy):
+ (WebKit::WebProcessPool::createNewWebProcess): Deleted.
+ (WebKit::WebProcessPool::setPluginLoadClientPolicyForPrivateBrowsing): Deleted.
+ (WebKit::WebProcessPool::setPrivateBrowsingPluginLoadClientPolicy): Deleted.
+ (WebKit::WebProcessPool::clearPluginClientPolicies): Deleted.
+ * UIProcess/WebProcessPool.h:
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::setPluginLoadClientPolicy):
+ (WebKit::WebPlatformStrategies::longestMatchedWildcardHostForHost):
+ (WebKit::WebPlatformStrategies::replaceHostWithMatchedWildcardHost):
+ (WebKit::WebPlatformStrategies::pluginLoadClientPolicyForHost):
+ (WebKit::WebPlatformStrategies::populatePluginCache):
+ (WebKit::WebPlatformStrategies::setPluginLoadClientPolicyForPrivateBrowsing): Deleted.
+ (WebKit::WebPlatformStrategies::setPrivateBrowsingPluginLoadClientPolicy): Deleted.
+ (WebKit::WebPlatformStrategies::clearPluginClientPolicies): Deleted.
+ (WebKit::WebPlatformStrategies::pluginLoadClientPolicyForHostForPrivateBrowsing): Deleted.
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess):
+ (WebKit::WebProcess::setPluginLoadClientPolicies): Deleted.
+ (WebKit::WebProcess::setPrivateBrowsingPluginLoadClientPolicy): Deleted.
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in:
+
+2016-05-17 Babak Shafiei <[email protected]>
+
Merge r200866. rdar://problem/26253396
2016-05-13 Beth Dakin <[email protected]>
Modified: branches/safari-602.1.32-branch/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (201020 => 201021)
--- branches/safari-602.1.32-branch/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2016-05-17 17:58:57 UTC (rev 201021)
@@ -139,7 +139,6 @@
#if ENABLE(NETSCAPE_PLUGIN_API)
encoder << pluginLoadClientPolicies;
- encoder << pluginLoadClientPoliciesForPrivateBrowsing;
#endif
#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
@@ -297,8 +296,6 @@
#if ENABLE(NETSCAPE_PLUGIN_API)
if (!decoder.decode(parameters.pluginLoadClientPolicies))
return false;
- if (!decoder.decode(parameters.pluginLoadClientPoliciesForPrivateBrowsing))
- return false;
#endif
#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
Modified: branches/safari-602.1.32-branch/Source/WebKit2/Shared/WebProcessCreationParameters.h (201020 => 201021)
--- branches/safari-602.1.32-branch/Source/WebKit2/Shared/WebProcessCreationParameters.h 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/Shared/WebProcessCreationParameters.h 2016-05-17 17:58:57 UTC (rev 201021)
@@ -164,7 +164,6 @@
#if ENABLE(NETSCAPE_PLUGIN_API)
HashMap<String, HashMap<String, HashMap<String, uint8_t>>> pluginLoadClientPolicies;
- HashMap<String, HashMap<String, HashMap<String, uint8_t>>> pluginLoadClientPoliciesForPrivateBrowsing;
#endif
#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
Modified: branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h (201020 => 201021)
--- branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h 2016-05-17 17:58:57 UTC (rev 201021)
@@ -39,7 +39,6 @@
WK_EXPORT bool WKContextIsPlugInUpdateAvailable(WKContextRef context, WKStringRef plugInBundleIdentifier);
WK_EXPORT void WKContextSetPluginLoadClientPolicy(WKContextRef context, WKPluginLoadClientPolicy policy, WKStringRef host, WKStringRef bundleIdentifier, WKStringRef versionString);
-WK_EXPORT void WKContextSetPrivateBrowsingPluginLoadClientPolicy(WKContextRef context, WKPluginLoadClientPolicy policy, WKStringRef host, WKStringRef bundleIdentifier, WKStringRef versionString);
WK_EXPORT void WKContextClearPluginClientPolicies(WKContextRef context);
WK_EXPORT WKDictionaryRef WKContextCopyPlugInInfoForBundleIdentifier(WKContextRef context, WKStringRef plugInBundleIdentifier);
Modified: branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm (201020 => 201021)
--- branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2016-05-17 17:58:57 UTC (rev 201021)
@@ -59,13 +59,6 @@
#endif
}
-void WKContextSetPrivateBrowsingPluginLoadClientPolicy(WKContextRef contextRef, WKPluginLoadClientPolicy policy, WKStringRef host, WKStringRef bundleIdentifier, WKStringRef versionString)
-{
-#if ENABLE(NETSCAPE_PLUGIN_API)
- toImpl(contextRef)->setPrivateBrowsingPluginLoadClientPolicy(toPluginLoadClientPolicy(policy), toWTFString(host), toWTFString(bundleIdentifier), toWTFString(versionString));
-#endif
-}
-
void WKContextClearPluginClientPolicies(WKContextRef contextRef)
{
#if ENABLE(NETSCAPE_PLUGIN_API)
Modified: branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/WebProcessPool.cpp (201020 => 201021)
--- branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-05-17 17:58:57 UTC (rev 201021)
@@ -627,7 +627,6 @@
#if ENABLE(NETSCAPE_PLUGIN_API)
parameters.pluginLoadClientPolicies = m_pluginLoadClientPolicies;
- parameters.pluginLoadClientPoliciesForPrivateBrowsing = m_pluginLoadClientPoliciesForPrivateBrowsing;
#endif
#if OS(LINUX)
@@ -1322,37 +1321,29 @@
m_client.plugInInformationBecameAvailable(this, API::Array::create(WTFMove(plugins)).ptr());
}
-void WebProcessPool::setPluginLoadClientPolicyForPrivateBrowsing(PrivateBrowsing privateBrowsing, WebCore::PluginLoadClientPolicy policy, const String& host, const String& bundleIdentifier, const String& versionString)
+void WebProcessPool::setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy policy, const String& host, const String& bundleIdentifier, const String& versionString)
{
#if ENABLE(NETSCAPE_PLUGIN_API)
- auto& pluginLoadClientPolicies = privateBrowsing == PrivateBrowsing::Yes ? m_pluginLoadClientPolicies : m_pluginLoadClientPoliciesForPrivateBrowsing;
+ HashMap<String, HashMap<String, uint8_t>> policiesByIdentifier;
+ if (m_pluginLoadClientPolicies.contains(host))
+ policiesByIdentifier = m_pluginLoadClientPolicies.get(host);
- HashMap<String, HashMap<String, uint8_t>> policiesByIdentifier = pluginLoadClientPolicies.get(host);
- HashMap<String, uint8_t> versionsToPolicies = policiesByIdentifier.get(bundleIdentifier);
+ HashMap<String, uint8_t> versionsToPolicies;
+ if (policiesByIdentifier.contains(bundleIdentifier))
+ versionsToPolicies = policiesByIdentifier.get(bundleIdentifier);
versionsToPolicies.set(versionString, policy);
policiesByIdentifier.set(bundleIdentifier, versionsToPolicies);
- pluginLoadClientPolicies.set(host, policiesByIdentifier);
+ m_pluginLoadClientPolicies.set(host, policiesByIdentifier);
#endif
-}
-void WebProcessPool::setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy policy, const String& host, const String& bundleIdentifier, const String& versionString)
-{
- setPluginLoadClientPolicyForPrivateBrowsing(PrivateBrowsing::No, policy, host, bundleIdentifier, versionString);
sendToAllProcesses(Messages::WebProcess::SetPluginLoadClientPolicy(policy, host, bundleIdentifier, versionString));
}
-void WebProcessPool::setPrivateBrowsingPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy policy, const String& host, const String& bundleIdentifier, const String& versionString)
-{
- setPluginLoadClientPolicyForPrivateBrowsing(PrivateBrowsing::Yes, policy, host, bundleIdentifier, versionString);
- sendToAllProcesses(Messages::WebProcess::SetPrivateBrowsingPluginLoadClientPolicy(policy, host, bundleIdentifier, versionString));
-}
-
void WebProcessPool::clearPluginClientPolicies()
{
#if ENABLE(NETSCAPE_PLUGIN_API)
m_pluginLoadClientPolicies.clear();
- m_pluginLoadClientPoliciesForPrivateBrowsing.clear();
#endif
sendToAllProcesses(Messages::WebProcess::ClearPluginClientPolicies());
}
Modified: branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/WebProcessPool.h (201020 => 201021)
--- branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/WebProcessPool.h 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/WebProcessPool.h 2016-05-17 17:58:57 UTC (rev 201021)
@@ -184,10 +184,6 @@
PluginInfoStore& pluginInfoStore() { return m_pluginInfoStore; }
void setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString);
- enum class PrivateBrowsing { Yes, No };
- void setPluginLoadClientPolicyForPrivateBrowsing(PrivateBrowsing, WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString);
- void setPrivateBrowsingPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString);
-
void clearPluginClientPolicies();
#endif
@@ -542,7 +538,6 @@
#if ENABLE(NETSCAPE_PLUGIN_API)
HashMap<String, HashMap<String, HashMap<String, uint8_t>>> m_pluginLoadClientPolicies;
- HashMap<String, HashMap<String, HashMap<String, uint8_t>>> m_pluginLoadClientPoliciesForPrivateBrowsing;
#endif
};
Modified: branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (201020 => 201021)
--- branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2016-05-17 17:58:57 UTC (rev 201021)
@@ -218,36 +218,28 @@
}
#if PLATFORM(MAC)
-void WebPlatformStrategies::setPluginLoadClientPolicyForPrivateBrowsing(PrivateBrowsing privateBrowsing, PluginLoadClientPolicy clientPolicy, const String& host, const String& bundleIdentifier, const String& versionString)
+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;
- auto& hostsToPluginIdentifierData = privateBrowsing == PrivateBrowsing::Yes ? m_hostsToPluginIdentifierDataInPrivateBrowsing : m_hostsToPluginIdentifierData;
+ PluginPolicyMapsByIdentifier policiesByIdentifier;
+ if (m_hostsToPluginIdentifierData.contains(hostToSet))
+ policiesByIdentifier = m_hostsToPluginIdentifierData.get(hostToSet);
- PluginPolicyMapsByIdentifier policiesByIdentifier = hostsToPluginIdentifierData.get(hostToSet);
- PluginLoadClientPoliciesByBundleVersion versionsToPolicies = policiesByIdentifier.get(bundleIdentifierToSet);
+ PluginLoadClientPoliciesByBundleVersion versionsToPolicies;
+ if (policiesByIdentifier.contains(bundleIdentifierToSet))
+ versionsToPolicies = policiesByIdentifier.get(bundleIdentifierToSet);
versionsToPolicies.set(versionStringToSet, clientPolicy);
policiesByIdentifier.set(bundleIdentifierToSet, versionsToPolicies);
- hostsToPluginIdentifierData.set(hostToSet, policiesByIdentifier);
+ m_hostsToPluginIdentifierData.set(hostToSet, policiesByIdentifier);
}
-void WebPlatformStrategies::setPluginLoadClientPolicy(PluginLoadClientPolicy clientPolicy, const String& host, const String& bundleIdentifier, const String& versionString)
-{
- setPluginLoadClientPolicyForPrivateBrowsing(PrivateBrowsing::No, clientPolicy, host, bundleIdentifier, versionString);
-}
-
-void WebPlatformStrategies::setPrivateBrowsingPluginLoadClientPolicy(PluginLoadClientPolicy clientPolicy, const String& host, const String& bundleIdentifier, const String& versionString)
-{
- setPluginLoadClientPolicyForPrivateBrowsing(PrivateBrowsing::Yes, clientPolicy, host, bundleIdentifier, versionString);
-}
-
void WebPlatformStrategies::clearPluginClientPolicies()
{
m_hostsToPluginIdentifierData.clear();
- m_hostsToPluginIdentifierDataInPrivateBrowsing.clear();
}
#endif
@@ -255,12 +247,11 @@
#if ENABLE(NETSCAPE_PLUGIN_API)
#if PLATFORM(MAC)
-String WebPlatformStrategies::longestMatchedWildcardHostForHost(const String& host, PrivateBrowsing privateBrowsing) const
+String WebPlatformStrategies::longestMatchedWildcardHostForHost(const String& host) const
{
String longestMatchedHost;
- auto& hostsToPluginIdentifierData = privateBrowsing == PrivateBrowsing::Yes ? m_hostsToPluginIdentifierDataInPrivateBrowsing : m_hostsToPluginIdentifierData;
- for (auto& key : hostsToPluginIdentifierData.keys()) {
+ for (auto& key : m_hostsToPluginIdentifierData.keys()) {
if (key.contains('*') && key != "*" && stringMatchesWildcardString(host, key)) {
if (key.length() > longestMatchedHost.length())
longestMatchedHost = key;
@@ -272,40 +263,38 @@
return longestMatchedHost;
}
-bool WebPlatformStrategies::replaceHostWithMatchedWildcardHost(String& host, const String& identifier, PrivateBrowsing privateBrowsing) const
+bool WebPlatformStrategies::replaceHostWithMatchedWildcardHost(String& host, const String& identifier) const
{
- String matchedWildcardHost = longestMatchedWildcardHostForHost(host, privateBrowsing);
+ String matchedWildcardHost = longestMatchedWildcardHostForHost(host);
if (matchedWildcardHost.isNull())
return false;
- auto& hostsToPluginIdentifierData = privateBrowsing == PrivateBrowsing::Yes ? m_hostsToPluginIdentifierDataInPrivateBrowsing : m_hostsToPluginIdentifierData;
- auto plugInIdentifierData = hostsToPluginIdentifierData.find(matchedWildcardHost);
- if (plugInIdentifierData == hostsToPluginIdentifierData.end() || !plugInIdentifierData->value.contains(identifier))
+ auto plugInIdentifierData = m_hostsToPluginIdentifierData.find(matchedWildcardHost);
+ if (plugInIdentifierData == m_hostsToPluginIdentifierData.end() || !plugInIdentifierData->value.contains(identifier))
return false;
host = matchedWildcardHost;
return true;
}
-bool WebPlatformStrategies::pluginLoadClientPolicyForHostForPrivateBrowsing(PrivateBrowsing privateBrowsing, const String& host, const PluginInfo& info, PluginLoadClientPolicy& policy) const
+bool WebPlatformStrategies::pluginLoadClientPolicyForHost(const String& host, const PluginInfo& info, PluginLoadClientPolicy& policy) const
{
String hostToLookUp = host;
String identifier = info.bundleIdentifier;
- auto& hostsToPluginIdentifierData = privateBrowsing == PrivateBrowsing::Yes ? m_hostsToPluginIdentifierDataInPrivateBrowsing : m_hostsToPluginIdentifierData;
- auto policiesByIdentifierIterator = hostsToPluginIdentifierData.find(hostToLookUp);
+ auto policiesByIdentifierIterator = m_hostsToPluginIdentifierData.find(hostToLookUp);
- if (!identifier.isNull() && policiesByIdentifierIterator == hostsToPluginIdentifierData.end()) {
- if (!replaceHostWithMatchedWildcardHost(hostToLookUp, identifier, privateBrowsing))
+ if (!identifier.isNull() && policiesByIdentifierIterator == m_hostsToPluginIdentifierData.end()) {
+ if (!replaceHostWithMatchedWildcardHost(hostToLookUp, identifier))
hostToLookUp = "*";
- policiesByIdentifierIterator = hostsToPluginIdentifierData.find(hostToLookUp);
- if (hostToLookUp != "*" && policiesByIdentifierIterator == hostsToPluginIdentifierData.end()) {
+ policiesByIdentifierIterator = m_hostsToPluginIdentifierData.find(hostToLookUp);
+ if (hostToLookUp != "*" && policiesByIdentifierIterator == m_hostsToPluginIdentifierData.end()) {
hostToLookUp = "*";
- policiesByIdentifierIterator = hostsToPluginIdentifierData.find(hostToLookUp);
+ policiesByIdentifierIterator = m_hostsToPluginIdentifierData.find(hostToLookUp);
}
}
- if (policiesByIdentifierIterator == hostsToPluginIdentifierData.end())
+ if (policiesByIdentifierIterator == m_hostsToPluginIdentifierData.end())
return false;
auto& policiesByIdentifier = policiesByIdentifierIterator->value;
@@ -356,7 +345,7 @@
String pageHost = page.mainFrame().loader().documentLoader()->responseURL().host();
for (PluginInfo& info : m_cachedPlugins) {
PluginLoadClientPolicy clientPolicy;
- if (pluginLoadClientPolicyForHostForPrivateBrowsing(page.usesEphemeralSession() ? PrivateBrowsing::Yes : PrivateBrowsing::No, pageHost, info, clientPolicy))
+ if (pluginLoadClientPolicyForHost(pageHost, info, clientPolicy))
info.clientLoadPolicy = clientPolicy;
}
#else
Modified: branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h (201020 => 201021)
--- branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2016-05-17 17:58:57 UTC (rev 201021)
@@ -70,7 +70,6 @@
typedef HashMap<String, PluginLoadClientPoliciesByBundleVersion> PluginPolicyMapsByIdentifier;
void setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString) override;
- void setPrivateBrowsingPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString) override;
void clearPluginClientPolicies() override;
#endif
@@ -113,12 +112,9 @@
#if PLATFORM(MAC)
HashMap<String, PluginPolicyMapsByIdentifier> m_hostsToPluginIdentifierData;
- HashMap<String, PluginPolicyMapsByIdentifier> m_hostsToPluginIdentifierDataInPrivateBrowsing;
- enum class PrivateBrowsing { Yes, No };
- String longestMatchedWildcardHostForHost(const String& host, PrivateBrowsing) const;
- bool pluginLoadClientPolicyForHostForPrivateBrowsing(PrivateBrowsing, const String&, const WebCore::PluginInfo&, WebCore::PluginLoadClientPolicy&) const;
- bool replaceHostWithMatchedWildcardHost(String& host, const String& identifier, PrivateBrowsing) const;
- void setPluginLoadClientPolicyForPrivateBrowsing(PrivateBrowsing, WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString);
+ 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)
};
Modified: branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebProcess.cpp (201020 => 201021)
--- branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2016-05-17 17:58:57 UTC (rev 201021)
@@ -388,26 +388,14 @@
#endif
#if ENABLE(NETSCAPE_PLUGIN_API) && PLATFORM(MAC)
- setPluginLoadClientPolicies(parameters.pluginLoadClientPoliciesForPrivateBrowsing, PrivateBrowsing::Yes);
- setPluginLoadClientPolicies(parameters.pluginLoadClientPolicies, PrivateBrowsing::No);
-#endif
-}
-
-#if ENABLE(NETSCAPE_PLUGIN_API) && PLATFORM(MAC)
-void WebProcess::setPluginLoadClientPolicies(const HashMap<String, HashMap<String, HashMap<String, uint8_t>>> &pluginPolicies, PrivateBrowsing privateBrowsing)
-{
- for (auto hostIter = pluginPolicies.begin(); hostIter != pluginPolicies.end(); ++hostIter) {
+ 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) {
- if (privateBrowsing == PrivateBrowsing::No)
- platformStrategies()->pluginStrategy()->setPluginLoadClientPolicy(static_cast<PluginLoadClientPolicy>(versionIter->value), hostIter->key, bundleIdentifierIter->key, versionIter->key);
- else
- platformStrategies()->pluginStrategy()->setPrivateBrowsingPluginLoadClientPolicy(static_cast<PluginLoadClientPolicy>(versionIter->value), hostIter->key, bundleIdentifierIter->key, versionIter->key);
- }
+ 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);
}
}
-}
#endif
+}
void WebProcess::ensureNetworkProcessConnection()
{
@@ -882,13 +870,6 @@
#endif
}
-void WebProcess::setPrivateBrowsingPluginLoadClientPolicy(uint8_t policy, const String& host, const String& bundleIdentifier, const String& versionString)
-{
-#if ENABLE(NETSCAPE_PLUGIN_API) && PLATFORM(MAC)
- platformStrategies()->pluginStrategy()->setPrivateBrowsingPluginLoadClientPolicy(static_cast<PluginLoadClientPolicy>(policy), host, bundleIdentifier, versionString);
-#endif
-}
-
void WebProcess::clearPluginClientPolicies()
{
#if ENABLE(NETSCAPE_PLUGIN_API) && PLATFORM(MAC)
Modified: branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebProcess.h (201020 => 201021)
--- branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebProcess.h 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebProcess.h 2016-05-17 17:58:57 UTC (rev 201021)
@@ -128,7 +128,6 @@
void plugInDidStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType, WebCore::SessionID);
void plugInDidReceiveUserInteraction(const String& pageOrigin, const String& pluginOrigin, const String& mimeType, WebCore::SessionID);
void setPluginLoadClientPolicy(uint8_t policy, const String& host, const String& bundleIdentifier, const String& versionString);
- void setPrivateBrowsingPluginLoadClientPolicy(uint8_t policy, const String& host, const String& bundleIdentifier, const String& versionString);
void clearPluginClientPolicies();
bool fullKeyboardAccessEnabled() const { return m_fullKeyboardAccessEnabled; }
@@ -371,10 +370,6 @@
#endif
#if ENABLE(NETSCAPE_PLUGIN_API)
-#if PLATFORM(MAC)
- enum class PrivateBrowsing { Yes, No };
- void setPluginLoadClientPolicies(const HashMap<String, HashMap<String, HashMap<String, uint8_t>>>&, PrivateBrowsing);
-#endif
RefPtr<PluginProcessConnectionManager> m_pluginProcessConnectionManager;
#endif
Modified: branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebProcess.messages.in (201020 => 201021)
--- branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebProcess.messages.in 2016-05-17 17:36:32 UTC (rev 201020)
+++ branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/WebProcess.messages.in 2016-05-17 17:58:57 UTC (rev 201021)
@@ -57,7 +57,6 @@
ResetPlugInAutoStartOriginDefaultHashes(HashMap<uint32_t,double> hashes)
ResetPlugInAutoStartOriginHashes(HashMap<WebCore::SessionID, HashMap<uint32_t,double>> hashes)
SetPluginLoadClientPolicy(uint8_t policy, String host, String bundleIdentifier, String versionString)
- SetPrivateBrowsingPluginLoadClientPolicy(uint8_t policy, String host, String bundleIdentifier, String versionString)
ClearPluginClientPolicies()
void StartMemorySampler(WebKit::SandboxExtension::Handle sampleLogFileHandle, String sampleLogFilePath, double interval);
