Title: [166651] trunk/Source/WebKit2
- Revision
- 166651
- Author
- [email protected]
- Date
- 2014-04-02 10:27:50 -0700 (Wed, 02 Apr 2014)
Log Message
Try a workaround for a crash
https://bugs.webkit.org/show_bug.cgi?id=131112
Reviewed by Sam Weinig.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView UIDelegate]):
(-[WKWebView setUIDelegate:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (166650 => 166651)
--- trunk/Source/WebKit2/ChangeLog 2014-04-02 17:21:09 UTC (rev 166650)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-02 17:27:50 UTC (rev 166651)
@@ -1,3 +1,14 @@
+2014-04-02 Anders Carlsson <[email protected]>
+
+ Try a workaround for a crash
+ https://bugs.webkit.org/show_bug.cgi?id=131112
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView UIDelegate]):
+ (-[WKWebView setUIDelegate:]):
+
2014-04-02 Martin Robinson <[email protected]>
REGRESSION(r165704): [GTK] Inspector resources not correctly generated
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (166650 => 166651)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-04-02 17:21:09 UTC (rev 166650)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-04-02 17:27:50 UTC (rev 166651)
@@ -236,11 +236,19 @@
- (id <WKUIDelegate>)UIDelegate
{
+ // FIXME: A closed page should still have a UI delegate - it should just never be called.
+ if (_page->isClosed())
+ return nil;
+
return [static_cast<WebKit::UIClient&>(_page->uiClient()).delegate().leakRef() autorelease];
}
- (void)setUIDelegate:(id<WKUIDelegate>)UIDelegate
{
+ // FIXME: A closed page should still have a UI delegate - it should just never be called.
+ if (_page->isClosed())
+ return;
+
static_cast<WebKit::UIClient&>(_page->uiClient()).setDelegate(UIDelegate);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
