Changeset 178858 in webkit

Timestamp:

Jan 21, 2015 2:30:43 PM (9 years ago)

Author:

Beth Dakin

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:]):

Location:

trunk/Source

Files:

• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebImmediateActionController.mm (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/mac/WKImmediateActionController.mm (modified) (1 diff)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2015-01-21  Beth Dakin  <bdakin@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  <ossy@webkit.org>
 

trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm

@@ -83 +83 @@
 {
     _webView = nil;
+
+    id animationController = _immediateActionRecognizer.animationController;
+    if ([animationController isKindOfClass:NSClassFromString(@"QLPreviewMenuItem")]) {
+        QLPreviewMenuItem *menuItem = (QLPreviewMenuItem *)animationController;
+        menuItem.delegate = nil;
+    }
+
     _immediateActionRecognizer = nil;
     _currentActionContext = nil;

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-01-21  Beth Dakin  <bdakin@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  <zdobersek@igalia.com>
 

trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm

@@ -76 +76 @@
     _wkView = nil;
     _hitTestResult = ActionMenuHitTestResult();
+
+    id animationController = _immediateActionRecognizer.animationController;
+    if ([animationController isKindOfClass:NSClassFromString(@"QLPreviewMenuItem")]) {
+        QLPreviewMenuItem *menuItem = (QLPreviewMenuItem *)animationController;
+        menuItem.delegate = nil;
+    }
+
     _immediateActionRecognizer = nil;
     _currentActionContext = nil;