Changeset 160512 in webkit

Timestamp:

Dec 12, 2013, 3:49:22 PM (11 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] Let the load delegate know when the Web process crashes
​https://bugs.webkit.org/show_bug.cgi?id=125660

Reviewed by Sam Weinig.

• UIProcess/API/Cocoa/WKBrowsingContextController.mm:

(processDidCrash): Implemented this WKPageLoaderClient callback by calling the load
delegate.
(setUpPageLoaderClient): Set the above callback in the client structure

• UIProcess/API/Cocoa/WKBrowsingContextLoadDelegatePrivate.h: Declare new delegate method.

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-12  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Let the load delegate know when the Web process crashes
+        https://bugs.webkit.org/show_bug.cgi?id=125660
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+        (processDidCrash):  Implemented this WKPageLoaderClient callback by calling the load
+        delegate.
+        (setUpPageLoaderClient): Set the above callback in the client structure
+        * UIProcess/API/Cocoa/WKBrowsingContextLoadDelegatePrivate.h: Declare new delegate method.
+
 2013-12-12  Anders Carlsson  <andersca@apple.com>
 

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

@@ -513 +513 @@
 }
 
+static void processDidCrash(WKPageRef page, const void* clientInfo)
+{
+    WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+    auto loadDelegate = browsingContext->_loadDelegate.get();
+
+    if ([loadDelegate respondsToSelector:@selector(browsingContextControllerWebProcessDidCrash:)])
+        [(id <WKBrowsingContextLoadDelegatePrivate>)loadDelegate browsingContextControllerWebProcessDidCrash:browsingContext];
+}
+
 static void setUpPageLoaderClient(WKBrowsingContextController *browsingContext, WebPageProxy& page)
 {
@@ -534 +543 @@
     loaderClient.didFinishProgress = didFinishProgress;
     loaderClient.didChangeBackForwardList = didChangeBackForwardList;
+
+    loaderClient.processDidCrash = processDidCrash;
 
     page.initializeLoaderClient(&loaderClient.base);

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

@@ -32 +32 @@
 - (void)browsingContextController:(WKBrowsingContextController *)sender didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge;
 
+- (void)browsingContextControllerWebProcessDidCrash:(WKBrowsingContextController *)sender;
+
 @end