Title: [203841] trunk/Source/WebKit/mac
- Revision
- 203841
- Author
- [email protected]
- Date
- 2016-07-28 14:17:58 -0700 (Thu, 28 Jul 2016)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (203840 => 203841)
--- trunk/Source/WebKit/mac/ChangeLog 2016-07-28 21:07:22 UTC (rev 203840)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-07-28 21:17:58 UTC (rev 203841)
@@ -1,3 +1,13 @@
+2016-07-28 Anders Carlsson <[email protected]>
+
+ 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 <[email protected]>
Fix the Windows debug build.
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (203840 => 203841)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2016-07-28 21:07:22 UTC (rev 203840)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2016-07-28 21:17:58 UTC (rev 203841)
@@ -333,8 +333,8 @@
WebView *webView = getWebView(m_webFrame.get());
WebResourceDelegateImplementationCache* implementations = WebViewGetResourceLoadDelegateImplementations(webView);
- id object = nil;
- BOOL shouldRelease = NO;
+ RetainPtr<id> object;
+
#if PLATFORM(IOS)
if (implementations->webThreadIdentifierForRequestFunc) {
object = CallResourceLoadDelegateInWebThread(implementations->webThreadIdentifierForRequestFunc, webView, @selector(webThreadWebView:identifierForInitialRequest:fromDataSource:), request.nsURLRequest(UpdateHTTPBody), dataSource(loader));
@@ -342,15 +342,10 @@
#endif
if (implementations->identifierForRequestFunc)
object = CallResourceLoadDelegate(implementations->identifierForRequestFunc, webView, @selector(webView:identifierForInitialRequest:fromDataSource:), request.nsURLRequest(UpdateHTTPBody), dataSource(loader));
- else {
- object = [[NSObject alloc] init];
- shouldRelease = YES;
- }
+ else
+ object = adoptNS([[NSObject alloc] init]);
- [webView _addObject:object forIdentifier:identifier];
-
- if (shouldRelease)
- [object release];
+ [webView _addObject:object.get() forIdentifier:identifier];
}
void WebFrameLoaderClient::dispatchWillSendRequest(DocumentLoader* loader, unsigned long identifier, ResourceRequest& request, const ResourceResponse& redirectResponse)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
