Changeset 218499 in webkit

Timestamp:

Jun 19, 2017 11:21:58 AM (7 years ago)

Author:

Chris Dumez

Message:

[WK2] Add WKProcessPool SPI to efficiently reset all plugin load client policies
​https://bugs.webkit.org/show_bug.cgi?id=173472
<rdar://problem/28858817>

Reviewed by Antti Koivisto.

Follow-up to r218419 to avoid copying the HashMap unnecessarily.

• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::resetPluginLoadClientPolicies):

• UIProcess/WebProcessPool.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebProcessPool.cpp (modified) (1 diff)
• UIProcess/WebProcessPool.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-06-19  Chris Dumez  <cdumez@apple.com>
+
+        [WK2] Add WKProcessPool SPI to efficiently reset all plugin load client policies
+        https://bugs.webkit.org/show_bug.cgi?id=173472
+        <rdar://problem/28858817>
+
+        Reviewed by Antti Koivisto.
+
+        Follow-up to r218419 to avoid copying the HashMap unnecessarily.
+
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::resetPluginLoadClientPolicies):
+        * UIProcess/WebProcessPool.h:
+
 2017-06-19  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp

@@ -1596 +1596 @@
 }
 
-void WebProcessPool::resetPluginLoadClientPolicies(const HashMap<String, HashMap<String, HashMap<String, uint8_t>>>& pluginLoadClientPolicies)
-{
-    m_pluginLoadClientPolicies.clear();
-
-    for (auto& hostPair : pluginLoadClientPolicies) {
-        auto& policiesForHost = m_pluginLoadClientPolicies.ensure(hostPair.key, [] { return HashMap<String, HashMap<String, uint8_t>>(); }).iterator->value;
-        for (auto& bundleIdentifierPair : hostPair.value) {
-            auto& versionsToPolicies = policiesForHost.ensure(bundleIdentifierPair.key, [] { return HashMap<String, uint8_t>(); }).iterator->value;
-            for (auto& versionPair : bundleIdentifierPair.value)
-                versionsToPolicies.set(versionPair.key, versionPair.value);
-        }
-    }
+void WebProcessPool::resetPluginLoadClientPolicies(HashMap<String, HashMap<String, HashMap<String, uint8_t>>>&& pluginLoadClientPolicies)
+{
+    m_pluginLoadClientPolicies = WTFMove(pluginLoadClientPolicies);
     sendToAllProcesses(Messages::WebProcess::ResetPluginLoadClientPolicies(m_pluginLoadClientPolicies));
 }

trunk/Source/WebKit2/UIProcess/WebProcessPool.h

@@ -198 +198 @@
 
     void setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString);
-    void resetPluginLoadClientPolicies(const HashMap<String, HashMap<String, HashMap<String, uint8_t>>>&);
+    void resetPluginLoadClientPolicies(HashMap<String, HashMap<String, HashMap<String, uint8_t>>>&&);
     void clearPluginClientPolicies();
     const HashMap<String, HashMap<String, HashMap<String, uint8_t>>>& pluginLoadClientPolicies() const { return m_pluginLoadClientPolicies; }