Title: [178492] branches/safari-600.5-branch/Source/WebKit/mac
- Revision
- 178492
- Author
- [email protected]
- Date
- 2015-01-15 00:41:33 -0800 (Thu, 15 Jan 2015)
Log Message
Merged r178126. rdar://problem/19412705
Modified Paths
Diff
Modified: branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog (178491 => 178492)
--- branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog 2015-01-15 08:00:33 UTC (rev 178491)
+++ branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog 2015-01-15 08:41:33 UTC (rev 178492)
@@ -1,3 +1,22 @@
+2015-01-15 Babak Shafiei <[email protected]>
+
+ Merge r178126. rdar://problem/19412705
+
+ 2015-01-08 Timothy Horton <[email protected]>
+
+ Can't use DataDetectors after immediate action preparation
+ https://bugs.webkit.org/show_bug.cgi?id=140263
+ <rdar://problem/19412705>
+
+ Reviewed by Beth Dakin.
+
+ * WebView/WebImmediateActionController.mm:
+ (-[WebImmediateActionController immediateActionRecognizerWillPrepare:]):
+ (-[WebImmediateActionController immediateActionRecognizerWillBeginAnimation:]):
+ To match WebKit2, only call shouldUseActions if the animation is actually
+ going to begin, not when preparing for it. This way, we're guaranteed
+ to get a didCancel or didComplete.
+
2015-01-14 Dana Burkart <[email protected]>
Merged r175400. <rdar://problem/19424166>
Modified: branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm (178491 => 178492)
--- branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-01-15 08:00:33 UTC (rev 178491)
+++ branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-01-15 08:41:33 UTC (rev 178492)
@@ -132,10 +132,14 @@
[self performHitTestAtPoint:locationInDocumentView];
[self _updateImmediateActionItem];
- if (!_immediateActionRecognizer.animationController) {
+ if (!_immediateActionRecognizer.animationController)
[self _cancelImmediateAction];
+}
+
+- (void)immediateActionRecognizerWillBeginAnimation:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer
+{
+ if (immediateActionRecognizer != _immediateActionRecognizer)
return;
- }
if (_currentActionContext) {
_hasActivatedActionContext = YES;
@@ -144,14 +148,6 @@
}
}
-- (void)immediateActionRecognizerWillBeginAnimation:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer
-{
- if (immediateActionRecognizer != _immediateActionRecognizer)
- return;
-
- // FIXME: Add support for the types of functionality provided in Action menu's menuNeedsUpdate.
-}
-
- (void)immediateActionRecognizerDidUpdateAnimation:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer
{
if (immediateActionRecognizer != _immediateActionRecognizer)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
