Title: [204323] trunk/Source/WebKit2
Revision
204323
Author
ander...@apple.com
Date
2016-08-09 20:55:29 -0700 (Tue, 09 Aug 2016)

Log Message

Fix iOS build.

* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::setPluginLoadClientPolicy): Deleted.
(WebKit::WebProcessPool::clearPluginClientPolicies): Deleted.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (204322 => 204323)


--- trunk/Source/WebKit2/ChangeLog	2016-08-10 03:47:58 UTC (rev 204322)
+++ trunk/Source/WebKit2/ChangeLog	2016-08-10 03:55:29 UTC (rev 204323)
@@ -1,5 +1,13 @@
 2016-08-09  Anders Carlsson  <ander...@apple.com>
 
+        Fix iOS build.
+
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::setPluginLoadClientPolicy): Deleted.
+        (WebKit::WebProcessPool::clearPluginClientPolicies): Deleted.
+
+2016-08-09  Anders Carlsson  <ander...@apple.com>
+
         Instantiate WebKit plug-ins at layout time, instead of at style resolution time
         https://bugs.webkit.org/show_bug.cgi?id=160715
 

Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (204322 => 204323)


--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp	2016-08-10 03:47:58 UTC (rev 204322)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp	2016-08-10 03:55:29 UTC (rev 204323)
@@ -1338,9 +1338,9 @@
     sendToNetworkingProcess(Messages::CustomProtocolManager::UnregisterScheme(scheme));
 }
 
+#if ENABLE(NETSCAPE_PLUGIN_API)
 void WebProcessPool::setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy policy, const String& host, const String& bundleIdentifier, const String& versionString)
 {
-#if ENABLE(NETSCAPE_PLUGIN_API)
     HashMap<String, HashMap<String, uint8_t>> policiesByIdentifier;
     if (m_pluginLoadClientPolicies.contains(host))
         policiesByIdentifier = m_pluginLoadClientPolicies.get(host);
@@ -1352,7 +1352,6 @@
     versionsToPolicies.set(versionString, policy);
     policiesByIdentifier.set(bundleIdentifier, versionsToPolicies);
     m_pluginLoadClientPolicies.set(host, policiesByIdentifier);
-#endif
 
     sendToAllProcesses(Messages::WebProcess::SetPluginLoadClientPolicy(policy, host, bundleIdentifier, versionString));
 }
@@ -1359,11 +1358,10 @@
 
 void WebProcessPool::clearPluginClientPolicies()
 {
-#if ENABLE(NETSCAPE_PLUGIN_API)
     m_pluginLoadClientPolicies.clear();
-#endif
     sendToAllProcesses(Messages::WebProcess::ClearPluginClientPolicies());
 }
+#endif
 
 void WebProcessPool::setMemoryCacheDisabled(bool disabled)
 {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to