Title: [160191] trunk/Source/WebKit2
Revision
160191
Author
[email protected]
Date
2013-12-05 13:38:09 -0800 (Thu, 05 Dec 2013)

Log Message

WebKit2 API should use weak ownership for delegate properties rather than assign
https://bugs.webkit.org/show_bug.cgi?id=125316
<rdar://problem/15560614>

Reviewed by Dan Bernstein.

Use WeakObjCPtr for the delegates.

* UIProcess/API/Cocoa/WKBrowsingContextController.h:
* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
(didStartProvisionalLoadForFrame):
(didReceiveServerRedirectForProvisionalLoadForFrame):
(didFailProvisionalLoadWithErrorForFrame):
(didCommitLoadForFrame):
(didFinishLoadForFrame):
(didFailLoadWithErrorForFrame):
(didStartProgress):
(didChangeProgress):
(didFinishProgress):
(didChangeBackForwardList):
(setUpPagePolicyClient):
(-[WKBrowsingContextController loadDelegate]):
(-[WKBrowsingContextController setLoadDelegate:]):
(-[WKBrowsingContextController policyDelegate]):
(-[WKBrowsingContextController setPolicyDelegate:]):
(-[WKBrowsingContextController historyDelegate]):
(-[WKBrowsingContextController setHistoryDelegate:]):
* UIProcess/API/Cocoa/WKBrowsingContextControllerInternal.h:
* UIProcess/API/Cocoa/WKConnection.mm:
(didReceiveMessage):
(didClose):
(-[WKConnection delegate]):
(-[WKConnection setDelegate:]):
* UIProcess/API/Cocoa/WKProcessGroup.mm:
(didCreateConnection):
(getInjectedBundleInitializationUserData):
(didNavigateWithNavigationData):
(didPerformClientRedirect):
(didPerformServerRedirect):
(didUpdateHistoryTitle):
(-[WKProcessGroup delegate]):
(-[WKProcessGroup setDelegate:]):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (160190 => 160191)


--- trunk/Source/WebKit2/ChangeLog	2013-12-05 21:15:59 UTC (rev 160190)
+++ trunk/Source/WebKit2/ChangeLog	2013-12-05 21:38:09 UTC (rev 160191)
@@ -1,5 +1,50 @@
 2013-12-05  Anders Carlsson  <[email protected]>
 
+        WebKit2 API should use weak ownership for delegate properties rather than assign
+        https://bugs.webkit.org/show_bug.cgi?id=125316
+        <rdar://problem/15560614>
+
+        Reviewed by Dan Bernstein.
+
+        Use WeakObjCPtr for the delegates.
+
+        * UIProcess/API/Cocoa/WKBrowsingContextController.h:
+        * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+        (didStartProvisionalLoadForFrame):
+        (didReceiveServerRedirectForProvisionalLoadForFrame):
+        (didFailProvisionalLoadWithErrorForFrame):
+        (didCommitLoadForFrame):
+        (didFinishLoadForFrame):
+        (didFailLoadWithErrorForFrame):
+        (didStartProgress):
+        (didChangeProgress):
+        (didFinishProgress):
+        (didChangeBackForwardList):
+        (setUpPagePolicyClient):
+        (-[WKBrowsingContextController loadDelegate]):
+        (-[WKBrowsingContextController setLoadDelegate:]):
+        (-[WKBrowsingContextController policyDelegate]):
+        (-[WKBrowsingContextController setPolicyDelegate:]):
+        (-[WKBrowsingContextController historyDelegate]):
+        (-[WKBrowsingContextController setHistoryDelegate:]):
+        * UIProcess/API/Cocoa/WKBrowsingContextControllerInternal.h:
+        * UIProcess/API/Cocoa/WKConnection.mm:
+        (didReceiveMessage):
+        (didClose):
+        (-[WKConnection delegate]):
+        (-[WKConnection setDelegate:]):
+        * UIProcess/API/Cocoa/WKProcessGroup.mm:
+        (didCreateConnection):
+        (getInjectedBundleInitializationUserData):
+        (didNavigateWithNavigationData):
+        (didPerformClientRedirect):
+        (didPerformServerRedirect):
+        (didUpdateHistoryTitle):
+        (-[WKProcessGroup delegate]):
+        (-[WKProcessGroup setDelegate:]):
+
+2013-12-05  Anders Carlsson  <[email protected]>
+
         Tweak WeakObjCPtr
         https://bugs.webkit.org/show_bug.cgi?id=125311
 

Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h (160190 => 160191)


--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h	2013-12-05 21:15:59 UTC (rev 160190)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h	2013-12-05 21:38:09 UTC (rev 160191)
@@ -44,9 +44,9 @@
 
 #pragma mark Delegates
 
-@property (assign) id <WKBrowsingContextLoadDelegate> loadDelegate;
-@property (assign) id <WKBrowsingContextPolicyDelegate> policyDelegate;
-@property (assign) id <WKBrowsingContextHistoryDelegate> historyDelegate;
+@property (weak) id <WKBrowsingContextLoadDelegate> loadDelegate;
+@property (weak) id <WKBrowsingContextPolicyDelegate> policyDelegate;
+@property (weak) id <WKBrowsingContextHistoryDelegate> historyDelegate;
 
 #pragma mark Loading
 

Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (160190 => 160191)


--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm	2013-12-05 21:15:59 UTC (rev 160190)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm	2013-12-05 21:38:09 UTC (rev 160191)
@@ -28,6 +28,7 @@
 
 #if WK_API_ENABLED
 
+#import "WeakObjCPtr.h"
 #import "ObjCObjectGraph.h"
 #import "WKBackForwardListInternal.h"
 #import "WKBackForwardListItemInternal.h"
@@ -112,11 +113,11 @@
 @implementation WKBrowsingContextController {
     API::ObjectStorage<WebPageProxy> _page;
     std::unique_ptr<PageLoadStateObserver> _pageLoadStateObserver;
+
+    WeakObjCPtr<id <WKBrowsingContextLoadDelegate>> _loadDelegate;
+    WeakObjCPtr<id <WKBrowsingContextPolicyDelegate>> _policyDelegate;
 }
 
-@synthesize loadDelegate = _loadDelegate;
-@synthesize policyDelegate = _policyDelegate;
-
 - (void)dealloc
 {
     _page->pageLoadState().removeObserver(*_pageLoadStateObserver);
@@ -368,8 +369,10 @@
         return;
 
     WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
-    if ([browsingContext.loadDelegate respondsToSelector:@selector(browsingContextControllerDidStartProvisionalLoad:)])
-        [browsingContext.loadDelegate browsingContextControllerDidStartProvisionalLoad:browsingContext];
+    auto loadDelegate = browsingContext->_loadDelegate.get();
+
+    if ([loadDelegate respondsToSelector:@selector(browsingContextControllerDidStartProvisionalLoad:)])
+        [loadDelegate browsingContextControllerDidStartProvisionalLoad:browsingContext];
 }
 
 static void didReceiveServerRedirectForProvisionalLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
@@ -378,8 +381,10 @@
         return;
 
     WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
-    if ([browsingContext.loadDelegate respondsToSelector:@selector(browsingContextControllerDidReceiveServerRedirectForProvisionalLoad:)])
-        [browsingContext.loadDelegate browsingContextControllerDidReceiveServerRedirectForProvisionalLoad:browsingContext];
+    auto loadDelegate = browsingContext->_loadDelegate.get();
+
+    if ([loadDelegate respondsToSelector:@selector(browsingContextControllerDidReceiveServerRedirectForProvisionalLoad:)])
+        [loadDelegate browsingContextControllerDidReceiveServerRedirectForProvisionalLoad:browsingContext];
 }
 
 static void didFailProvisionalLoadWithErrorForFrame(WKPageRef page, WKFrameRef frame, WKErrorRef error, WKTypeRef userData, const void* clientInfo)
@@ -388,9 +393,11 @@
         return;
 
     WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
-    if ([browsingContext.loadDelegate respondsToSelector:@selector(browsingContextController:didFailProvisionalLoadWithError:)]) {
+    auto loadDelegate = browsingContext->_loadDelegate.get();
+
+    if ([loadDelegate respondsToSelector:@selector(browsingContextController:didFailProvisionalLoadWithError:)]) {
         RetainPtr<NSError> nsError = adoptNS(createErrorWithRecoveryAttempter(error, frame, browsingContext));
-        [browsingContext.loadDelegate browsingContextController:browsingContext didFailProvisionalLoadWithError:nsError.get()];
+        [loadDelegate browsingContextController:browsingContext didFailProvisionalLoadWithError:nsError.get()];
     }
 }
 
@@ -400,8 +407,10 @@
         return;
 
     WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
-    if ([browsingContext.loadDelegate respondsToSelector:@selector(browsingContextControllerDidCommitLoad:)])
-        [browsingContext.loadDelegate browsingContextControllerDidCommitLoad:browsingContext];
+    auto loadDelegate = browsingContext->_loadDelegate.get();
+
+    if ([loadDelegate respondsToSelector:@selector(browsingContextControllerDidCommitLoad:)])
+        [loadDelegate browsingContextControllerDidCommitLoad:browsingContext];
 }
 
 static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
@@ -410,8 +419,10 @@
         return;
 
     WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
-    if ([browsingContext.loadDelegate respondsToSelector:@selector(browsingContextControllerDidFinishLoad:)])
-        [browsingContext.loadDelegate browsingContextControllerDidFinishLoad:browsingContext];
+    auto loadDelegate = browsingContext->_loadDelegate.get();
+
+    if ([loadDelegate respondsToSelector:@selector(browsingContextControllerDidFinishLoad:)])
+        [loadDelegate browsingContextControllerDidFinishLoad:browsingContext];
 }
 
 static void didFailLoadWithErrorForFrame(WKPageRef page, WKFrameRef frame, WKErrorRef error, WKTypeRef userData, const void* clientInfo)
@@ -420,42 +431,52 @@
         return;
 
     WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
-    if ([browsingContext.loadDelegate respondsToSelector:@selector(browsingContextController:didFailLoadWithError:)]) {
+    auto loadDelegate = browsingContext->_loadDelegate.get();
+
+    if ([loadDelegate respondsToSelector:@selector(browsingContextController:didFailLoadWithError:)]) {
         RetainPtr<NSError> nsError = adoptNS(createErrorWithRecoveryAttempter(error, frame, browsingContext));
-        [browsingContext.loadDelegate browsingContextController:browsingContext didFailLoadWithError:nsError.get()];
+        [loadDelegate browsingContextController:browsingContext didFailLoadWithError:nsError.get()];
     }
 }
 
 static void didStartProgress(WKPageRef page, const void* clientInfo)
 {
     WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
-    if ([browsingContext.loadDelegate respondsToSelector:@selector(browsingContextControllerDidStartProgress:)])
-        [browsingContext.loadDelegate browsingContextControllerDidStartProgress:browsingContext];
+    auto loadDelegate = browsingContext->_loadDelegate.get();
+
+    if ([loadDelegate respondsToSelector:@selector(browsingContextControllerDidStartProgress:)])
+        [loadDelegate browsingContextControllerDidStartProgress:browsingContext];
 }
 
 static void didChangeProgress(WKPageRef page, const void* clientInfo)
 {
     WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
-    if ([browsingContext.loadDelegate respondsToSelector:@selector(browsingContextController:estimatedProgressChangedTo:)])
-        [browsingContext.loadDelegate browsingContextController:browsingContext estimatedProgressChangedTo:toImpl(page)->estimatedProgress()];
+    auto loadDelegate = browsingContext->_loadDelegate.get();
+
+    if ([loadDelegate respondsToSelector:@selector(browsingContextController:estimatedProgressChangedTo:)])
+        [loadDelegate browsingContextController:browsingContext estimatedProgressChangedTo:toImpl(page)->estimatedProgress()];
 }
 
 static void didFinishProgress(WKPageRef page, const void* clientInfo)
 {
     WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
-    if ([browsingContext.loadDelegate respondsToSelector:@selector(browsingContextControllerDidFinishProgress:)])
-        [browsingContext.loadDelegate browsingContextControllerDidFinishProgress:browsingContext];
+    auto loadDelegate = browsingContext->_loadDelegate.get();
+
+    if ([loadDelegate respondsToSelector:@selector(browsingContextControllerDidFinishProgress:)])
+        [loadDelegate browsingContextControllerDidFinishProgress:browsingContext];
 }
 
 static void didChangeBackForwardList(WKPageRef page, WKBackForwardListItemRef addedItem, WKArrayRef removedItems, const void *clientInfo)
 {
     WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
-    if (![browsingContext.loadDelegate respondsToSelector:@selector(browsingContextControllerDidChangeBackForwardList:addedItem:removedItems:)])
+    auto loadDelegate = browsingContext->_loadDelegate.get();
+
+    if (![loadDelegate respondsToSelector:@selector(browsingContextControllerDidChangeBackForwardList:addedItem:removedItems:)])
         return;
 
     WKBackForwardListItem *added = addedItem ? wrapper(*toImpl(addedItem)) : nil;
     NSArray *removed = removedItems ? wrapper(*toImpl(removedItems)) : nil;
-    [browsingContext.loadDelegate browsingContextControllerDidChangeBackForwardList:browsingContext addedItem:added removedItems:removed];
+    [loadDelegate browsingContextControllerDidChangeBackForwardList:browsingContext addedItem:added removedItems:removed];
 }
 
 static void setUpPageLoaderClient(WKBrowsingContextController *browsingContext, WebPageProxy& page)
@@ -514,7 +535,9 @@
     policyClient.decidePolicyForNavigationAction = [](WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKFrameRef originatingFrame, WKURLRequestRef request, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
     {
         WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
-        if ([browsingContext.policyDelegate respondsToSelector:@selector(browsingContextController:decidePolicyForNavigationAction:decisionHandler:)]) {
+        auto policyDelegate = browsingContext->_policyDelegate.get();
+
+        if ([policyDelegate respondsToSelector:@selector(browsingContextController:decidePolicyForNavigationAction:decisionHandler:)]) {
             NSDictionary *actionDictionary = @{
                 WKActionIsMainFrameKey: @(WKFrameIsMainFrame(frame)),
                 WKActionNavigationTypeKey: @(navigationType),
@@ -528,7 +551,7 @@
                 [(NSMutableDictionary *)actionDictionary setObject:[NSURL _web_URLWithWTFString:toImpl(originatingFrame)->url()] forKey:WKActionOriginatingFrameURLKey];
             }
             
-            [browsingContext.policyDelegate browsingContextController:browsingContext decidePolicyForNavigationAction:actionDictionary decisionHandler:makePolicyDecisionBlock(listener)];
+            [policyDelegate browsingContextController:browsingContext decidePolicyForNavigationAction:actionDictionary decisionHandler:makePolicyDecisionBlock(listener)];
         } else
             WKFramePolicyListenerUse(listener);
     };
@@ -536,7 +559,9 @@
     policyClient.decidePolicyForNewWindowAction = [](WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKURLRequestRef request, WKStringRef frameName, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
     {
         WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
-        if ([browsingContext.policyDelegate respondsToSelector:@selector(browsingContextController:decidePolicyForNewWindowAction:decisionHandler:)]) {
+        auto policyDelegate = browsingContext->_policyDelegate.get();
+
+        if ([policyDelegate respondsToSelector:@selector(browsingContextController:decidePolicyForNewWindowAction:decisionHandler:)]) {
             NSDictionary *actionDictionary = @{
                 WKActionIsMainFrameKey: @(WKFrameIsMainFrame(frame)),
                 WKActionNavigationTypeKey: @(navigationType),
@@ -546,7 +571,7 @@
                 WKActionFrameNameKey: toImpl(frameName)->wrapper()
             };
             
-            [browsingContext.policyDelegate browsingContextController:browsingContext decidePolicyForNewWindowAction:actionDictionary decisionHandler:makePolicyDecisionBlock(listener)];
+            [policyDelegate browsingContextController:browsingContext decidePolicyForNewWindowAction:actionDictionary decisionHandler:makePolicyDecisionBlock(listener)];
         } else
             WKFramePolicyListenerUse(listener);
     };
@@ -554,7 +579,9 @@
     policyClient.decidePolicyForResponse = [](WKPageRef page, WKFrameRef frame, WKURLResponseRef response, WKURLRequestRef request, bool canShowMIMEType, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
     {
         WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
-        if ([browsingContext.policyDelegate respondsToSelector:@selector(browsingContextController:decidePolicyForResponseAction:decisionHandler:)]) {
+        auto policyDelegate = browsingContext->_policyDelegate.get();
+
+        if ([policyDelegate respondsToSelector:@selector(browsingContextController:decidePolicyForResponseAction:decisionHandler:)]) {
             NSDictionary *actionDictionary = @{
                 WKActionIsMainFrameKey: @(WKFrameIsMainFrame(frame)),
                 WKActionURLRequestKey: adoptNS(WKURLRequestCopyNSURLRequest(request)).get(),
@@ -562,7 +589,7 @@
                 WKActionCanShowMIMETypeKey: @(canShowMIMEType),
             };
 
-            [browsingContext.policyDelegate browsingContextController:browsingContext decidePolicyForResponseAction:actionDictionary decisionHandler:makePolicyDecisionBlock(listener)];
+            [policyDelegate browsingContextController:browsingContext decidePolicyForResponseAction:actionDictionary decisionHandler:makePolicyDecisionBlock(listener)];
         } else
             WKFramePolicyListenerUse(listener);
     };
@@ -572,13 +599,14 @@
 
 - (id <WKBrowsingContextLoadDelegate>)loadDelegate
 {
-    return _loadDelegate;
+    return _loadDelegate.getAutoreleased();
 }
 
 - (void)setLoadDelegate:(id <WKBrowsingContextLoadDelegate>)loadDelegate
 {
     _loadDelegate = loadDelegate;
-    if (_loadDelegate)
+
+    if (loadDelegate)
         setUpPageLoaderClient(self, *_page);
     else
         _page->initializeLoaderClient(nullptr);
@@ -586,18 +614,29 @@
 
 - (id <WKBrowsingContextPolicyDelegate>)policyDelegate
 {
-    return _policyDelegate;
+    return _policyDelegate.getAutoreleased();
 }
 
 - (void)setPolicyDelegate:(id <WKBrowsingContextPolicyDelegate>)policyDelegate
 {
     _policyDelegate = policyDelegate;
-    if (_policyDelegate)
+
+    if (policyDelegate)
         setUpPagePolicyClient(self, *_page);
     else
         _page->initializePolicyClient(nullptr);
 }
 
+- (id <WKBrowsingContextHistoryDelegate>)historyDelegate
+{
+    return _historyDelegate.getAutoreleased();
+}
+
+- (void)setHistoryDelegate:(id <WKBrowsingContextHistoryDelegate>)historyDelegate
+{
+    _historyDelegate = historyDelegate;
+}
+
 + (NSMutableSet *)customSchemes
 {
     static NSMutableSet *customSchemes = [[NSMutableSet alloc] init];

Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextControllerInternal.h (160190 => 160191)


--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextControllerInternal.h	2013-12-05 21:15:59 UTC (rev 160190)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextControllerInternal.h	2013-12-05 21:38:09 UTC (rev 160191)
@@ -28,6 +28,7 @@
 #if WK_API_ENABLED
 
 #import "WKObject.h"
+#import "WeakObjCPtr.h"
 #import "WebPageProxy.h"
 
 namespace WebKit {
@@ -40,7 +41,10 @@
 
 }
 
-@interface WKBrowsingContextController () <WKObject>
+@interface WKBrowsingContextController () <WKObject> {
+@package
+    WebKit::WeakObjCPtr<id <WKBrowsingContextHistoryDelegate>> _historyDelegate;
+}
 
 - (void)_finishInitialization;
 + (NSMutableSet *)customSchemes;

Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKConnection.mm (160190 => 160191)


--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKConnection.mm	2013-12-05 21:15:59 UTC (rev 160190)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKConnection.mm	2013-12-05 21:38:09 UTC (rev 160191)
@@ -33,6 +33,7 @@
 #import "WKRetainPtr.h"
 #import "WKSharedAPICast.h"
 #import "WKStringCF.h"
+#import "WeakObjCPtr.h"
 #import <wtf/RetainPtr.h>
 #import <wtf/text/WTFString.h>
 
@@ -41,10 +42,10 @@
 @implementation WKConnection {
     API::ObjectStorage<WebConnection> _connection;
     RetainPtr<WKRemoteObjectRegistry> _remoteObjectRegistry;
+
+    WeakObjCPtr<id <WKConnectionDelegate>> _delegate;
 }
 
-@synthesize delegate = _delegate;
-
 - (void)dealloc
 {
     _connection->~WebConnection();
@@ -58,18 +59,21 @@
     if ([connection->_remoteObjectRegistry _handleMessageWithName:messageName body:messageBody])
         return;
 
-    if ([connection.delegate respondsToSelector:@selector(connection:didReceiveMessageWithName:body:)]) {
+    auto delegate = connection->_delegate.get();
+    if ([delegate respondsToSelector:@selector(connection:didReceiveMessageWithName:body:)]) {
         RetainPtr<CFStringRef> nsMessageName = adoptCF(WKStringCopyCFString(kCFAllocatorDefault, messageName));
         RetainPtr<id> nsMessageBody = ((ObjCObjectGraph*)messageBody)->rootObject();
-        [connection.delegate connection:connection didReceiveMessageWithName:(NSString *)nsMessageName.get() body:nsMessageBody.get()];
+        [delegate connection:connection didReceiveMessageWithName:(NSString *)nsMessageName.get() body:nsMessageBody.get()];
     }
 }
 
 static void didClose(WKConnectionRef, const void* clientInfo)
 {
     WKConnection *connection = (WKConnection *)clientInfo;
-    if ([connection.delegate respondsToSelector:@selector(connectionDidClose:)])
-        [connection.delegate connectionDidClose:connection];
+    auto delegate = connection->_delegate.get();
+
+    if ([delegate respondsToSelector:@selector(connectionDidClose:)])
+        [delegate connectionDidClose:connection];
 }
 
 static void setUpClient(WKConnection *wrapper, WebConnection& connection)
@@ -87,13 +91,13 @@
 
 - (id <WKConnectionDelegate>)delegate
 {
-    return _delegate;
+    return _delegate.getAutoreleased();
 }
 
 - (void)setDelegate:(id <WKConnectionDelegate>)delegate
 {
     _delegate = delegate;
-    if (_delegate)
+    if (delegate)
         setUpClient(self, *_connection);
     else
         _connection->initializeConnectionClient(nullptr);

Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm (160190 => 160191)


--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm	2013-12-05 21:15:59 UTC (rev 160190)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm	2013-12-05 21:38:09 UTC (rev 160191)
@@ -40,6 +40,7 @@
 #import "WKNavigationDataInternal.h"
 #import "WKRetainPtr.h"
 #import "WKStringCF.h"
+#import "WeakObjCPtr.h"
 #import "WebFrameProxy.h"
 #import <wtf/RetainPtr.h>
 
@@ -54,6 +55,8 @@
 @implementation WKProcessGroup {
     API::ObjectStorage<WebContext> _context;
 
+    WeakObjCPtr<id <WKProcessGroupDelegate>> _delegate;
+
 #if PLATFORM(IOS)
     RetainPtr<WKGeolocationProviderIOS> _geolocationProvider;
 #endif // PLATFORM(IOS)
@@ -69,8 +72,10 @@
 static void didCreateConnection(WKContextRef, WKConnectionRef connectionRef, const void* clientInfo)
 {
     WKProcessGroup *processGroup = (WKProcessGroup *)clientInfo;
-    if ([processGroup.delegate respondsToSelector:@selector(processGroup:didCreateConnectionToWebProcessPlugIn:)])
-        [processGroup.delegate processGroup:processGroup didCreateConnectionToWebProcessPlugIn:wrapper(*toImpl(connectionRef))];
+    auto delegate = processGroup->_delegate.get();
+
+    if ([delegate respondsToSelector:@selector(processGroup:didCreateConnectionToWebProcessPlugIn:)])
+        [delegate processGroup:processGroup didCreateConnectionToWebProcessPlugIn:wrapper(*toImpl(connectionRef))];
 }
 
 static void setUpConnectionClient(WKProcessGroup *processGroup, WKContextRef contextRef)
@@ -88,8 +93,10 @@
 static WKTypeRef getInjectedBundleInitializationUserData(WKContextRef, const void* clientInfo)
 {
     WKProcessGroup *processGroup = (WKProcessGroup *)clientInfo;
-    if ([processGroup.delegate respondsToSelector:@selector(processGroupWillCreateConnectionToWebProcessPlugIn:)]) {
-        RetainPtr<id> initializationUserData = [processGroup.delegate processGroupWillCreateConnectionToWebProcessPlugIn:processGroup];
+    auto delegate = processGroup->_delegate.get();
+
+    if ([delegate respondsToSelector:@selector(processGroupWillCreateConnectionToWebProcessPlugIn:)]) {
+        RetainPtr<id> initializationUserData = [delegate processGroupWillCreateConnectionToWebProcessPlugIn:processGroup];
         RefPtr<WebKit::ObjCObjectGraph> wkMessageBody = WebKit::ObjCObjectGraph::create(initializationUserData.get());
         return (WKTypeRef)wkMessageBody.release().leakRef();
     }
@@ -115,8 +122,10 @@
         return;
 
     WKBrowsingContextController *controller = wrapper(*toImpl(pageRef));
-    if ([controller.historyDelegate respondsToSelector:@selector(browsingContextController:didNavigateWithNavigationData:)])
-        [controller.historyDelegate browsingContextController:controller didNavigateWithNavigationData:wrapper(*toImpl(navigationDataRef))];
+    auto historyDelegate = controller->_historyDelegate.get();
+
+    if ([historyDelegate respondsToSelector:@selector(browsingContextController:didNavigateWithNavigationData:)])
+        [historyDelegate browsingContextController:controller didNavigateWithNavigationData:wrapper(*toImpl(navigationDataRef))];
 }
 
 static void didPerformClientRedirect(WKContextRef, WKPageRef pageRef, WKURLRef sourceURLRef, WKURLRef destinationURLRef, WKFrameRef frameRef, const void*)
@@ -125,8 +134,10 @@
         return;
 
     WKBrowsingContextController *controller = wrapper(*toImpl(pageRef));
-    if ([controller.historyDelegate respondsToSelector:@selector(browsingContextController:didPerformClientRedirectFromURL:toURL:)])
-        [controller.historyDelegate browsingContextController:controller didPerformClientRedirectFromURL:wrapper(*toImpl(sourceURLRef)) toURL:wrapper(*toImpl(destinationURLRef))];
+    auto historyDelegate = controller->_historyDelegate.get();
+
+    if ([historyDelegate respondsToSelector:@selector(browsingContextController:didPerformClientRedirectFromURL:toURL:)])
+        [historyDelegate browsingContextController:controller didPerformClientRedirectFromURL:wrapper(*toImpl(sourceURLRef)) toURL:wrapper(*toImpl(destinationURLRef))];
 }
 
 static void didPerformServerRedirect(WKContextRef, WKPageRef pageRef, WKURLRef sourceURLRef, WKURLRef destinationURLRef, WKFrameRef frameRef, const void*)
@@ -135,8 +146,10 @@
         return;
 
     WKBrowsingContextController *controller = wrapper(*toImpl(pageRef));
-    if ([controller.historyDelegate respondsToSelector:@selector(browsingContextController:didPerformServerRedirectFromURL:toURL:)])
-        [controller.historyDelegate browsingContextController:controller didPerformServerRedirectFromURL:wrapper(*toImpl(sourceURLRef)) toURL:wrapper(*toImpl(destinationURLRef))];
+    auto historyDelegate = controller->_historyDelegate.get();
+
+    if ([historyDelegate respondsToSelector:@selector(browsingContextController:didPerformServerRedirectFromURL:toURL:)])
+        [historyDelegate browsingContextController:controller didPerformServerRedirectFromURL:wrapper(*toImpl(sourceURLRef)) toURL:wrapper(*toImpl(destinationURLRef))];
 }
 
 static void didUpdateHistoryTitle(WKContextRef, WKPageRef pageRef, WKStringRef titleRef, WKURLRef urlRef, WKFrameRef frameRef, const void*)
@@ -145,8 +158,10 @@
         return;
 
     WKBrowsingContextController *controller = wrapper(*toImpl(pageRef));
-    if ([controller.historyDelegate respondsToSelector:@selector(browsingContextController:didUpdateHistoryTitle:forURL:)])
-        [controller.historyDelegate browsingContextController:controller didUpdateHistoryTitle:wrapper(*toImpl(titleRef)) forURL:wrapper(*toImpl(urlRef))];
+    auto historyDelegate = controller->_historyDelegate.get();
+
+    if ([historyDelegate respondsToSelector:@selector(browsingContextController:didUpdateHistoryTitle:forURL:)])
+        [historyDelegate browsingContextController:controller didUpdateHistoryTitle:wrapper(*toImpl(titleRef)) forURL:wrapper(*toImpl(urlRef))];
 }
 
 static void setUpHistoryClient(WKProcessGroup *processGroup, WKContextRef contextRef)
@@ -189,6 +204,16 @@
     return self;
 }
 
+- (id <WKProcessGroupDelegate>)delegate
+{
+    return _delegate.getAutoreleased();
+}
+
+- (void)setDelegate:(id <WKProcessGroupDelegate>)delegate
+{
+    _delegate = delegate;
+}
+
 #pragma mark WKObject protocol implementation
 
 - (API::Object&)_apiObject
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to