Changeset 218704 in webkit

Timestamp:

Jun 22, 2017 10:07:52 AM (7 years ago)

Author:

ddkilzer@apple.com

Message:

v2: REGRESSION (r218419): 3 NSMutableDictionary leaks calling -[WKProcessPool _pluginLoadClientPolicies]
<​https://webkit.org/b/173689>

Reviewed by Chris Dumez.

• UIProcess/API/Cocoa/WKProcessPool.mm:

(policiesHashMapToDictionary): Use -dictionaryWithCapacity:
instead of -new since the former returns an autoreleased object
while the latter does not. This has the added benefit of tuning
the size of each NSMutableDictionary.

• UIProcess/API/Cocoa/WKProcessPoolPrivate.h:

(-[WKProcessPool _pluginLoadClientPolicies]): Remove 'copy'
attribute from @property declaration since it is read-only.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (2 diffs)
• UIProcess/API/Cocoa/WKProcessPool.mm (modified) (1 diff)
• UIProcess/API/Cocoa/WKProcessPoolPrivate.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-06-22  David Kilzer  <ddkilzer@apple.com>
+
+        v2: REGRESSION (r218419): 3 NSMutableDictionary leaks calling -[WKProcessPool _pluginLoadClientPolicies]
+        <https://webkit.org/b/173689>
+
+        Reviewed by Chris Dumez.
+
+        * UIProcess/API/Cocoa/WKProcessPool.mm:
+        (policiesHashMapToDictionary): Use -dictionaryWithCapacity:
+        instead of -new since the former returns an autoreleased object
+        while the latter does not.  This has the added benefit of tuning
+        the size of each NSMutableDictionary.
+        * UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
+        (-[WKProcessPool _pluginLoadClientPolicies]): Remove 'copy'
+        attribute from @property declaration since it is read-only.
+
 2017-06-22  Carlos Garcia Campos  <cgarcia@igalia.com>
 
@@ -78 +94 @@
 2017-06-21  David Kilzer  <ddkilzer@apple.com>
 
-        REGRESSION (r218419): 3 NSMutableDiciontary leaks calling -[WKProcessPool _pluginLoadClientPolicies]
+        REGRESSION (r218419): 3 NSMutableDictionary leaks calling -[WKProcessPool _pluginLoadClientPolicies]
         <https://webkit.org/b/173689>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm

@@ -314 +314 @@
 static NSDictionary *policiesHashMapToDictionary(const HashMap<String, HashMap<String, HashMap<String, uint8_t>>>& map)
 {
-    NSMutableDictionary *policies = [NSMutableDictionary new];
+    NSMutableDictionary *policies = [NSMutableDictionary dictionaryWithCapacity:map.size()];
     for (auto& hostPair : map) {
         NSString *host = hostPair.key;
-        policies[host] = [NSMutableDictionary new];
+        policies[host] = [NSMutableDictionary dictionaryWithCapacity:hostPair.value.size()];
         for (auto& bundleIdentifierPair : hostPair.value) {
             NSString *bundlerIdentifier = bundleIdentifierPair.key;
-            policies[host][bundlerIdentifier] = [NSMutableDictionary new];
+            policies[host][bundlerIdentifier] = [NSMutableDictionary dictionaryWithCapacity:bundleIdentifierPair.value.size()];
             for (auto& versionPair : bundleIdentifierPair.value) {
                 NSString *version = versionPair.key;

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h

@@ -55 +55 @@
 #if !TARGET_OS_IPHONE
 - (void)_resetPluginLoadClientPolicies:(NSDictionary *)policies WK_API_AVAILABLE(macosx(WK_MAC_TBA));
-@property (nonatomic, readonly, copy) NSDictionary *_pluginLoadClientPolicies WK_API_AVAILABLE(macosx(WK_MAC_TBA));
+@property (nonatomic, readonly) NSDictionary *_pluginLoadClientPolicies WK_API_AVAILABLE(macosx(WK_MAC_TBA));
 #endif