Title: [190499] branches/safari-601-branch/Source/WebKit/mac
- Revision
- 190499
- Author
- [email protected]
- Date
- 2015-10-02 06:57:41 -0700 (Fri, 02 Oct 2015)
Log Message
Merge r189122. rdar://problem/22801996
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebKit/mac/ChangeLog (190498 => 190499)
--- branches/safari-601-branch/Source/WebKit/mac/ChangeLog 2015-10-02 13:57:34 UTC (rev 190498)
+++ branches/safari-601-branch/Source/WebKit/mac/ChangeLog 2015-10-02 13:57:41 UTC (rev 190499)
@@ -1,5 +1,23 @@
2015-10-02 Matthew Hanson <[email protected]>
+ Merge r189122. rdar://problem/22801996
+
+ 2015-08-28 Beth Dakin <[email protected]>
+
+ Crash in WK1 when clicking on a PDF inside an iframe
+ https://bugs.webkit.org/show_bug.cgi?id=148585
+ -and corresponding-
+ rdar://problem/22165194
+
+ Reviewed by Tim Horton.
+
+ Only handle WebHTMLViews.
+ * WebView/WebImmediateActionController.mm:
+ (-[WebImmediateActionController immediateActionRecognizerWillPrepare:]):
+ (-[WebImmediateActionController immediateActionRecognizerDidCancelAnimation:]):
+
+2015-10-02 Matthew Hanson <[email protected]>
+
Merge r188990. rdar://problem/22802029
2015-08-26 Beth Dakin <[email protected]>
Modified: branches/safari-601-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm (190498 => 190499)
--- branches/safari-601-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-10-02 13:57:34 UTC (rev 190498)
+++ branches/safari-601-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-10-02 13:57:41 UTC (rev 190499)
@@ -159,12 +159,17 @@
if (!_webView)
return;
+ NSView *documentView = [[[_webView _selectedOrMainFrame] frameView] documentView];
+ if (![documentView isKindOfClass:[WebHTMLView class]]) {
+ [self _cancelImmediateAction];
+ return;
+ }
+
if (immediateActionRecognizer != _immediateActionRecognizer)
return;
[_webView _setMaintainsInactiveSelection:YES];
- WebHTMLView *documentView = [[[_webView _selectedOrMainFrame] frameView] documentView];
NSPoint locationInDocumentView = [immediateActionRecognizer locationInView:documentView];
[self performHitTestAtPoint:locationInDocumentView];
[self _updateImmediateActionItem];
@@ -209,7 +214,11 @@
if (immediateActionRecognizer != _immediateActionRecognizer)
return;
- Frame* coreFrame = core([[[[_webView _selectedOrMainFrame] frameView] documentView] _frame]);
+ NSView *documentView = [[[_webView _selectedOrMainFrame] frameView] documentView];
+ if (![documentView isKindOfClass:[WebHTMLView class]])
+ return;
+
+ Frame* coreFrame = core([(WebHTMLView *)documentView _frame]);
if (coreFrame) {
ImmediateActionStage lastStage = coreFrame->eventHandler().immediateActionStage();
if (lastStage == ImmediateActionStage::ActionUpdated)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
