Title: [179150] branches/safari-600.4-branch/Source
- Revision
- 179150
- Author
- [email protected]
- Date
- 2015-01-26 16:19:07 -0800 (Mon, 26 Jan 2015)
Log Message
Merge r178858. rdar://problem/19540806
Modified Paths
Diff
Modified: branches/safari-600.4-branch/Source/WebKit/mac/ChangeLog (179149 => 179150)
--- branches/safari-600.4-branch/Source/WebKit/mac/ChangeLog 2015-01-26 23:23:05 UTC (rev 179149)
+++ branches/safari-600.4-branch/Source/WebKit/mac/ChangeLog 2015-01-27 00:19:07 UTC (rev 179150)
@@ -1,3 +1,20 @@
+2015-01-26 Matthew Hanson <[email protected]>
+
+ Merge r178858. rdar://problem/19540806
+
+ 2015-01-21 Beth Dakin <[email protected]>
+
+ 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-20 Matthew Hanson <[email protected]>
Rollout r178679. rdar://problem/19448129
Modified: branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm (179149 => 179150)
--- branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-01-26 23:23:05 UTC (rev 179149)
+++ branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-01-27 00:19:07 UTC (rev 179150)
@@ -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: branches/safari-600.4-branch/Source/WebKit2/ChangeLog (179149 => 179150)
--- branches/safari-600.4-branch/Source/WebKit2/ChangeLog 2015-01-26 23:23:05 UTC (rev 179149)
+++ branches/safari-600.4-branch/Source/WebKit2/ChangeLog 2015-01-27 00:19:07 UTC (rev 179150)
@@ -1,3 +1,20 @@
+2015-01-26 Matthew Hanson <[email protected]>
+
+ Merge r178858. rdar://problem/19540806
+
+ 2015-01-21 Beth Dakin <[email protected]>
+
+ 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-20 Matthew Hanson <[email protected]>
Rollout r178679. rdar://problem/19448129
Modified: branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (179149 => 179150)
--- branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-26 23:23:05 UTC (rev 179149)
+++ branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-27 00:19:07 UTC (rev 179150)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
