Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Unified Diff: ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc

Issue 228973003: Don't treat first touch move differently from future touch moves (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add extra return. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/gesture_detection/touch_disposition_gesture_filter.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c7e744a2eafafb413b85b319308539ed199413cf..7424ee8edfbfdde3c8f65d2b2541ba6501fc399e 100644
--- a/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc
+++ b/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc
@@ -719,9 +719,10 @@ TEST_F(TouchDispositionGestureFilterTest, TapCancelledWhenTouchConsumed) {
PushGesture(ET_GESTURE_SCROLL_BEGIN);
MoveTouchPoint(0, 2, 2);
SendTouchConsumedAck();
- EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_TAP_CANCEL),
- GetAndResetSentGestures()));
- EXPECT_EQ(LastSentGestureLocation(), gfx::PointF(2, 2));
+ EXPECT_TRUE(
+ GesturesMatch(Gestures(ET_GESTURE_TAP_CANCEL, ET_GESTURE_SCROLL_BEGIN),
+ GetAndResetSentGestures()));
+ EXPECT_EQ(LastSentGestureLocation(), gfx::PointF(1, 1));
}
TEST_F(TouchDispositionGestureFilterTest,
@@ -1032,16 +1033,18 @@ TEST_F(TouchDispositionGestureFilterTest, TestDisallowedMultiFingerSwipe) {
PushGesture(ET_GESTURE_SCROLL_BEGIN);
MoveTouchPoint(0, 0, 0);
SendTouchConsumedAck();
- EXPECT_FALSE(GesturesSent());
+ EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_BEGIN),
+ GetAndResetSentGestures()));
PushGesture(ET_GESTURE_PINCH_BEGIN);
PressTouchPoint(1, 1);
SendTouchNotConsumedAck();
- EXPECT_FALSE(GesturesSent());
+ EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_PINCH_BEGIN),
+ GetAndResetSentGestures()));
PushGesture(ET_GESTURE_SWIPE);
PressTouchPoint(1, 1);
- SendTouchNotConsumedAck();
+ SendTouchConsumedAck();
EXPECT_FALSE(GesturesSent());
}
« no previous file with comments | « ui/events/gesture_detection/touch_disposition_gesture_filter.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698