Title: [178605] trunk/Source/WebKit/mac
- Revision
- 178605
- Author
- bda...@apple.com
- Date
- 2015-01-16 14:51:30 -0800 (Fri, 16 Jan 2015)
Log Message
Make sure early cancellation of immediate action actually does that in WK1
https://bugs.webkit.org/show_bug.cgi?id=140566
-and corresponding-
rdar://problem/19490114
Reviewed by Tim Horton.
Work around an AppKit bug by dispatching the call to _cancelImmediateAction
asynchronously.
* WebView/WebImmediateActionController.mm:
(-[WebImmediateActionController immediateActionRecognizerWillPrepare:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (178604 => 178605)
--- trunk/Source/WebKit/mac/ChangeLog 2015-01-16 22:22:46 UTC (rev 178604)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-01-16 22:51:30 UTC (rev 178605)
@@ -1,3 +1,17 @@
+2015-01-16 Beth Dakin <bda...@apple.com>
+
+ Make sure early cancellation of immediate action actually does that in WK1
+ https://bugs.webkit.org/show_bug.cgi?id=140566
+ -and corresponding-
+ rdar://problem/19490114
+
+ Reviewed by Tim Horton.
+
+ Work around an AppKit bug by dispatching the call to _cancelImmediateAction
+ asynchronously.
+ * WebView/WebImmediateActionController.mm:
+ (-[WebImmediateActionController immediateActionRecognizerWillPrepare:]):
+
2015-01-16 Daniel Bates <daba...@apple.com>
Fix the public iOS SDK build after <http://trac.webkit.org/changeset/178285>
Modified: trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm (178604 => 178605)
--- trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-01-16 22:22:46 UTC (rev 178604)
+++ trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-01-16 22:51:30 UTC (rev 178605)
@@ -133,8 +133,12 @@
[self performHitTestAtPoint:locationInDocumentView];
[self _updateImmediateActionItem];
- if (!_immediateActionRecognizer.animationController)
- [self _cancelImmediateAction];
+ if (!_immediateActionRecognizer.animationController) {
+ // FIXME: We should be able to remove the dispatch_async when rdar://problem/19502927 is resolved.
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self _cancelImmediateAction];
+ });
+ }
}
- (void)immediateActionRecognizerWillBeginAnimation:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
