Title: [178858] trunk/Source
- Revision
- 178858
- Author
- bda...@apple.com
- Date
- 2015-01-21 14:30:43 -0800 (Wed, 21 Jan 2015)
Log Message
Crash in QuickLook preview delegate method
https://bugs.webkit.org/show_bug.cgi?id=140740
-and corresponding-
rdar://problem/19540806
Reviewed by Tim Horton.
Clear out the delegate.
Source/WebKit/mac:
* WebView/WebImmediateActionController.mm:
(-[WebImmediateActionController webViewClosed]):
Source/WebKit2:
* UIProcess/mac/WKImmediateActionController.mm:
(-[WKImmediateActionController willDestroyView:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (178857 => 178858)
--- trunk/Source/WebKit/mac/ChangeLog 2015-01-21 21:56:22 UTC (rev 178857)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-01-21 22:30:43 UTC (rev 178858)
@@ -1,3 +1,16 @@
+2015-01-21 Beth Dakin <bda...@apple.com>
+
+ Crash in QuickLook preview delegate method
+ https://bugs.webkit.org/show_bug.cgi?id=140740
+ -and corresponding-
+ rdar://problem/19540806
+
+ Reviewed by Tim Horton.
+
+ Clear out the delegate.
+ * WebView/WebImmediateActionController.mm:
+ (-[WebImmediateActionController webViewClosed]):
+
2015-01-21 Csaba Osztrogonác <o...@webkit.org>
Remove ENABLE(INSPECTOR) ifdef guards
Modified: trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm (178857 => 178858)
--- trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-01-21 21:56:22 UTC (rev 178857)
+++ trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-01-21 22:30:43 UTC (rev 178858)
@@ -82,6 +82,13 @@
- (void)webViewClosed
{
_webView = nil;
+
+ id animationController = _immediateActionRecognizer.animationController;
+ if ([animationController isKindOfClass:NSClassFromString(@"QLPreviewMenuItem")]) {
+ QLPreviewMenuItem *menuItem = (QLPreviewMenuItem *)animationController;
+ menuItem.delegate = nil;
+ }
+
_immediateActionRecognizer = nil;
_currentActionContext = nil;
}
Modified: trunk/Source/WebKit2/ChangeLog (178857 => 178858)
--- trunk/Source/WebKit2/ChangeLog 2015-01-21 21:56:22 UTC (rev 178857)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-21 22:30:43 UTC (rev 178858)
@@ -1,3 +1,16 @@
+2015-01-21 Beth Dakin <bda...@apple.com>
+
+ Crash in QuickLook preview delegate method
+ https://bugs.webkit.org/show_bug.cgi?id=140740
+ -and corresponding-
+ rdar://problem/19540806
+
+ Reviewed by Tim Horton.
+
+ Clear out the delegate.
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController willDestroyView:]):
+
2015-01-21 Zan Dobersek <zdober...@igalia.com>
AsyncRequestImpl casting in AsyncRequest::completeRequest() is incorrect
Modified: trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (178857 => 178858)
--- trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-21 21:56:22 UTC (rev 178857)
+++ trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-21 22:30:43 UTC (rev 178858)
@@ -75,6 +75,13 @@
_page = nullptr;
_wkView = nil;
_hitTestResult = ActionMenuHitTestResult();
+
+ id animationController = _immediateActionRecognizer.animationController;
+ if ([animationController isKindOfClass:NSClassFromString(@"QLPreviewMenuItem")]) {
+ QLPreviewMenuItem *menuItem = (QLPreviewMenuItem *)animationController;
+ menuItem.delegate = nil;
+ }
+
_immediateActionRecognizer = nil;
_currentActionContext = nil;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
