Title: [179156] branches/safari-600.4-branch/Source/WebKit2
- Revision
- 179156
- Author
- matthew_han...@apple.com
- Date
- 2015-01-26 16:19:21 -0800 (Mon, 26 Jan 2015)
Log Message
Merge r179087. rdar://problem/19571057
Modified Paths
Diff
Modified: branches/safari-600.4-branch/Source/WebKit2/ChangeLog (179155 => 179156)
--- branches/safari-600.4-branch/Source/WebKit2/ChangeLog 2015-01-27 00:19:19 UTC (rev 179155)
+++ branches/safari-600.4-branch/Source/WebKit2/ChangeLog 2015-01-27 00:19:21 UTC (rev 179156)
@@ -1,5 +1,25 @@
2015-01-26 Matthew Hanson <matthew_han...@apple.com>
+ Merge r179087. rdar://problem/19571057
+
+ 2015-01-25 Timothy Horton <timothy_hor...@apple.com>
+
+ Unresponsive Web processes sometimes throw ObjC exceptions under didPerformActionMenuHitTest:
+ https://bugs.webkit.org/show_bug.cgi?id=140859
+ <rdar://problem/19571057>
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController didPerformActionMenuHitTest:userData:]):
+ If we've already given up on this gesture (either because it was canceled or the
+ willBeginAnimation timeout expired), we shouldn't build a new animationController for it.
+ This is true both because it wouldn't look good to swap animationControllers out
+ from under the gesture, but also because AppKit throws an exception when you do this
+ and that breaks a lot of things.
+
+2015-01-26 Matthew Hanson <matthew_han...@apple.com>
+
Merge r179023. rdar://problem/19573674
2015-01-23 Timothy Horton <timothy_hor...@apple.com>
Modified: branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (179155 => 179156)
--- branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-27 00:19:19 UTC (rev 179155)
+++ branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-27 00:19:21 UTC (rev 179156)
@@ -131,6 +131,11 @@
- (void)didPerformActionMenuHitTest:(const ActionMenuHitTestResult&)hitTestResult userData:(API::Object*)userData
{
+ // If we've already given up on this gesture (either because it was canceled or the
+ // willBeginAnimation timeout expired), we shouldn't build a new animationController for it.
+ if (_state != ImmediateActionState::Pending)
+ return;
+
// FIXME: This needs to use the WebKit2 callback mechanism to avoid out-of-order replies.
_state = ImmediateActionState::Ready;
_hitTestResult = hitTestResult;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
