Index: ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc |
diff --git a/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc b/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc |
index 391c66968f7cf642f503a2cc4cb84ff90ff96776..5ca210a07e3c88a5dfea5d1070fd25c0be995575 100644 |
--- a/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc |
+++ b/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc |
@@ -711,21 +711,18 @@ TEST_F(TouchDispositionGestureFilterTest, |
TapNotCancelledIfTapEndingEventReceived) { |
PushGesture(ET_GESTURE_TAP_DOWN); |
PressTouchPoint(1, 1); |
- PressTouchPoint(2, 2); |
- SendTouchNotConsumedAck(); |
SendTouchNotConsumedAck(); |
- EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_TAP_DOWN), |
- GetAndResetSentGestures())); |
+ EXPECT_TRUE( |
+ GesturesMatch(Gestures(ET_GESTURE_TAP_DOWN), GetAndResetSentGestures())); |
PushGesture(ET_GESTURE_TAP); |
ReleaseTouchPoint(); |
SendTouchNotConsumedAck(); |
- EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SHOW_PRESS, |
- ET_GESTURE_TAP), |
+ EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SHOW_PRESS, ET_GESTURE_TAP), |
GetAndResetSentGestures())); |
// The tap should not be cancelled as it was terminated by a |ET_GESTURE_TAP|. |
- ReleaseTouchPoint(); |
+ PressTouchPoint(2, 2); |
SendTouchConsumedAck(); |
EXPECT_FALSE(GesturesSent()); |
} |
@@ -1027,4 +1024,17 @@ TEST_F(TouchDispositionGestureFilterTest, TestDisallowedMultiFingerSwipe) { |
EXPECT_FALSE(GesturesSent()); |
} |
+TEST_F(TouchDispositionGestureFilterTest, TapCancelOnSecondFingerDown) { |
+ PushGesture(ET_GESTURE_TAP_DOWN); |
+ PressTouchPoint(1, 1); |
+ SendTouchNotConsumedAck(); |
+ EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_TAP_DOWN), |
+ GetAndResetSentGestures())); |
+ |
+ PressTouchPoint(1, 1); |
+ SendTouchNotConsumedAck(); |
+ EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_TAP_CANCEL), |
+ GetAndResetSentGestures())); |
+} |
+ |
} // namespace ui |