Changeset 203841 in webkit

Timestamp:

Jul 28, 2016 2:17:58 PM (8 years ago)

Author:

andersca@apple.com

Message:

Use a RetainPtr in WebFrameLoaderClient::assignIdentifierToInitialRequest
​https://bugs.webkit.org/show_bug.cgi?id=160315

Reviewed by Tim Horton.

• WebCoreSupport/WebFrameLoaderClient.mm:

(WebFrameLoaderClient::assignIdentifierToInitialRequest):

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/WebFrameLoaderClient.mm (modified) (2 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2016-07-28  Anders Carlsson  <andersca@apple.com>
+
+        Use a RetainPtr in WebFrameLoaderClient::assignIdentifierToInitialRequest
+        https://bugs.webkit.org/show_bug.cgi?id=160315
+
+        Reviewed by Tim Horton.
+
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (WebFrameLoaderClient::assignIdentifierToInitialRequest):
+
 2016-07-26  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

@@ -334 +334 @@
     WebResourceDelegateImplementationCache* implementations = WebViewGetResourceLoadDelegateImplementations(webView);
 
-    id object = nil;
-    BOOL shouldRelease = NO;
+    RetainPtr<id> object;
+
 #if PLATFORM(IOS)
     if (implementations->webThreadIdentifierForRequestFunc) {
@@ -343 +343 @@
     if (implementations->identifierForRequestFunc)
         object = CallResourceLoadDelegate(implementations->identifierForRequestFunc, webView, @selector(webView:identifierForInitialRequest:fromDataSource:), request.nsURLRequest(UpdateHTTPBody), dataSource(loader));
-    else {
-        object = [[NSObject alloc] init];
-        shouldRelease = YES;
-    }
-
-    [webView _addObject:object forIdentifier:identifier];
-
-    if (shouldRelease)
-        [object release];
+    else
+        object = adoptNS([[NSObject alloc] init]);
+
+    [webView _addObject:object.get() forIdentifier:identifier];
 }