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

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

Issue 407313002: Add a MotionEventGeneric implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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 7424ee8edfbfdde3c8f65d2b2541ba6501fc399e..4a7887e5493a54fd74145ce79d52256496f9ebe7 100644
--- a/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc
+++ b/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc
@@ -37,9 +37,9 @@ class TouchDispositionGestureFilterTest
last_sent_gesture_location_ = gfx::PointF(event.x, event.y);
last_sent_gesture_raw_location_ = gfx::PointF(event.raw_x, event.raw_y);
if (cancel_after_next_gesture_) {
+ cancel_after_next_gesture_ = false;
CancelTouchPoint();
SendTouchNotConsumedAck();
- cancel_after_next_gesture_ = false;
}
}
@@ -574,11 +574,11 @@ TEST_F(TouchDispositionGestureFilterTest, MultipleTouchSequences) {
TEST_F(TouchDispositionGestureFilterTest, FlingCancelledOnNewTouchSequence) {
const gfx::Vector2dF raw_offset(1.3f, 3.7f);
- SetRawTouchOffset(raw_offset);
// Simulate a fling.
PushGesture(ET_GESTURE_TAP_DOWN);
PushGesture(ET_GESTURE_SCROLL_BEGIN);
PressTouchPoint(1, 1);
+ SetRawTouchOffset(raw_offset);
SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(
Gestures(

Powered by Google App Engine
This is Rietveld 408576698