Title: [180422] branches/safari-600.5-branch/Source/WebKit2
- Revision
- 180422
- Author
- dburk...@apple.com
- Date
- 2015-02-20 10:29:47 -0800 (Fri, 20 Feb 2015)
Log Message
Merged r180242. <rdar://19870992>
Modified Paths
Diff
Modified: branches/safari-600.5-branch/Source/WebKit2/ChangeLog (180421 => 180422)
--- branches/safari-600.5-branch/Source/WebKit2/ChangeLog 2015-02-20 18:22:36 UTC (rev 180421)
+++ branches/safari-600.5-branch/Source/WebKit2/ChangeLog 2015-02-20 18:29:47 UTC (rev 180422)
@@ -1,3 +1,23 @@
+2015-02-20 Dana Burkart <dburk...@apple.com>
+
+ Merged r180242. <rdar://problem/19870992>
+
+ 2015-02-17 Timothy Horton <timothy_hor...@apple.com>
+
+ REGRESSION (r178595): Clicking on DD highlights sometimes do not work
+ https://bugs.webkit.org/show_bug.cgi?id=141728
+ <rdar://problem/19825372>
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController _cancelImmediateActionIfNeeded]):
+ (-[WKImmediateActionController immediateActionRecognizerWillBeginAnimation:]):
+ The change that r178595 intended to make was purely that things that we
+ have no immediate actions for should cancel the immediate action gesture recognizer.
+ Moving the DataDetectors activation code as well breaks strict ordering
+ of immediate action callbacks vs. shouldUseActionsWithContext: that they depend on.
+
2015-02-19 Dana Burkart <dburk...@apple.com>
Merged r180115. <rdar://problem/19850758>
Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (180421 => 180422)
--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-02-20 18:22:36 UTC (rev 180421)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-02-20 18:29:47 UTC (rev 180422)
@@ -105,12 +105,6 @@
{
if (![_immediateActionRecognizer animationController])
[self _cancelImmediateAction];
-
- if (_currentActionContext) {
- _hasActivatedActionContext = YES;
- if (![getDDActionsManagerClass() shouldUseActionsWithContext:_currentActionContext.get()])
- [self _cancelImmediateAction];
- }
}
- (void)_clearImmediateActionState
@@ -192,6 +186,12 @@
[self _updateImmediateActionItem];
[self _cancelImmediateActionIfNeeded];
}
+
+ if (_currentActionContext) {
+ _hasActivatedActionContext = YES;
+ if (![getDDActionsManagerClass() shouldUseActionsWithContext:_currentActionContext.get()])
+ [self _cancelImmediateAction];
+ }
}
- (void)immediateActionRecognizerDidUpdateAnimation:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
