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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 182383007: Make the ContentGestureProvider a ui::FilteredGestureProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Lower similarity Created 6 years, 10 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 4b4b67f7346319b7820fd444269c1f58eba8edf0..687a0b7b540e6ce2605071b95b215d6eb2becbf8 100644
--- a/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc
+++ b/ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc
@@ -117,21 +117,16 @@ class TouchDispositionGestureFilterTest
return queue_->OnGesturePacket(packet);
}
- void SendTouchEventACK(
- TouchDispositionGestureFilter::TouchEventAck ack_result) {
- queue_->OnTouchEventAck(ack_result);
+ void SendTouchEventAck(bool event_consumed) {
+ queue_->OnTouchEventAck(event_consumed);
}
void SendTouchConsumedAck() {
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchEventAck(true);
}
- void SendNotConsumedAck() {
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
- }
-
- void SendNoConsumerExistsAck() {
- SendTouchEventACK(TouchDispositionGestureFilter::NO_CONSUMER_EXISTS);
+ void SendTouchNotConsumedAck() {
+ SendTouchEventAck(false);
}
void PushGesture(EventType type) {
@@ -194,13 +189,13 @@ TEST_F(TouchDispositionGestureFilterTest, BasicNoGestures) {
// No gestures should be dispatched by the ack, as the queued packets
// contained no gestures.
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_FALSE(GesturesSent());
// Release the touch gesture.
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
+ SendTouchConsumedAck();
EXPECT_FALSE(GesturesSent());
}
@@ -209,7 +204,7 @@ TEST_F(TouchDispositionGestureFilterTest, BasicGestures) {
PushGesture(ET_GESTURE_SCROLL_BEGIN);
PressTouchPoint(1, 1);
EXPECT_FALSE(GesturesSent());
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_BEGIN),
GetAndResetSentGestures()));
@@ -218,7 +213,7 @@ TEST_F(TouchDispositionGestureFilterTest, BasicGestures) {
PushGesture(ET_SCROLL_FLING_CANCEL);
ReleaseTouchPoint();
EXPECT_FALSE(GesturesSent());
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_SCROLL_FLING_START,
ET_SCROLL_FLING_CANCEL),
GetAndResetSentGestures()));
@@ -228,13 +223,13 @@ TEST_F(TouchDispositionGestureFilterTest, BasicGesturesConsumed) {
// A consumed touch's gesture should not be sent.
PushGesture(ET_GESTURE_SCROLL_BEGIN);
PressTouchPoint(1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_FALSE(GesturesSent());
PushGesture(ET_SCROLL_FLING_START);
PushGesture(ET_SCROLL_FLING_CANCEL);
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_FALSE(GesturesSent());
}
@@ -242,19 +237,19 @@ TEST_F(TouchDispositionGestureFilterTest, ConsumedThenNotConsumed) {
// A consumed touch's gesture should not be sent.
PushGesture(ET_GESTURE_SCROLL_BEGIN);
PressTouchPoint(1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_FALSE(GesturesSent());
// Even if the subsequent touch is not consumed, continue dropping gestures.
PushGesture(ET_GESTURE_SCROLL_UPDATE);
MoveTouchPoint(0, 2, 2);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_FALSE(GesturesSent());
// Even if the subsequent touch had no consumer, continue dropping gestures.
PushGesture(ET_SCROLL_FLING_START);
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_FALSE(GesturesSent());
}
@@ -262,33 +257,33 @@ TEST_F(TouchDispositionGestureFilterTest, NotConsumedThenConsumed) {
// A not consumed touch's gesture should be sent.
PushGesture(ET_GESTURE_SCROLL_BEGIN);
PressTouchPoint(1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_BEGIN),
GetAndResetSentGestures()));
// A newly consumed gesture should not be sent.
PushGesture(ET_GESTURE_PINCH_BEGIN);
PressTouchPoint(10, 10);
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_FALSE(GesturesSent());
// And subsequent non-consumed pinch updates should not be sent.
PushGesture(ET_GESTURE_SCROLL_UPDATE);
PushGesture(ET_GESTURE_PINCH_UPDATE);
MoveTouchPoint(0, 2, 2);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_UPDATE),
GetAndResetSentGestures()));
// End events dispatched only when their start events were.
PushGesture(ET_GESTURE_PINCH_END);
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_FALSE(GesturesSent());
PushGesture(ET_GESTURE_SCROLL_END);
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_END),
GetAndResetSentGestures()));
}
@@ -297,26 +292,26 @@ TEST_F(TouchDispositionGestureFilterTest, ScrollAlternatelyConsumed) {
// A consumed touch's gesture should not be sent.
PushGesture(ET_GESTURE_SCROLL_BEGIN);
PressTouchPoint(1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_BEGIN),
GetAndResetSentGestures()));
for (size_t i = 0; i < 3; ++i) {
PushGesture(ET_GESTURE_SCROLL_UPDATE);
MoveTouchPoint(0, 2, 2);
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_FALSE(GesturesSent());
PushGesture(ET_GESTURE_SCROLL_UPDATE);
MoveTouchPoint(0, 3, 3);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_UPDATE),
GetAndResetSentGestures()));
}
PushGesture(ET_GESTURE_SCROLL_END);
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_END),
GetAndResetSentGestures()));
}
@@ -325,7 +320,7 @@ TEST_F(TouchDispositionGestureFilterTest, NotConsumedThenNoConsumer) {
// An unconsumed touch's gesture should be sent.
PushGesture(ET_GESTURE_SCROLL_BEGIN);
PressTouchPoint(1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_BEGIN),
GetAndResetSentGestures()));
@@ -333,7 +328,7 @@ TEST_F(TouchDispositionGestureFilterTest, NotConsumedThenNoConsumer) {
// pressed but not on a touch handling rect), send the gesture.
PushGesture(ET_GESTURE_PINCH_BEGIN);
PressTouchPoint(2, 2);
- SendTouchEventACK(TouchDispositionGestureFilter::NO_CONSUMER_EXISTS);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_PINCH_BEGIN),
GetAndResetSentGestures()));
@@ -341,13 +336,13 @@ TEST_F(TouchDispositionGestureFilterTest, NotConsumedThenNoConsumer) {
// of the ack state.
PushGesture(ET_GESTURE_PINCH_END);
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_PINCH_END),
GetAndResetSentGestures()));
PushGesture(ET_GESTURE_SCROLL_END);
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_END),
GetAndResetSentGestures()));
}
@@ -355,20 +350,20 @@ TEST_F(TouchDispositionGestureFilterTest, NotConsumedThenNoConsumer) {
TEST_F(TouchDispositionGestureFilterTest, EndingEventsSent) {
PushGesture(ET_GESTURE_SCROLL_BEGIN);
PressTouchPoint(1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_BEGIN),
GetAndResetSentGestures()));
PushGesture(ET_GESTURE_PINCH_BEGIN);
PressTouchPoint(2, 2);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_PINCH_BEGIN),
GetAndResetSentGestures()));
// Consuming the touchend event can't suppress the match end gesture.
PushGesture(ET_GESTURE_PINCH_END);
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_PINCH_END),
GetAndResetSentGestures()));
@@ -376,7 +371,7 @@ TEST_F(TouchDispositionGestureFilterTest, EndingEventsSent) {
PushGesture(ET_GESTURE_SCROLL_UPDATE);
PushGesture(ET_GESTURE_SCROLL_END);
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_END),
GetAndResetSentGestures()));
@@ -384,13 +379,13 @@ TEST_F(TouchDispositionGestureFilterTest, EndingEventsSent) {
// regard.
PushGesture(ET_GESTURE_SCROLL_BEGIN);
PressTouchPoint(1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_BEGIN),
GetAndResetSentGestures()));
PushGesture(ET_SCROLL_FLING_START);
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_SCROLL_FLING_START),
GetAndResetSentGestures()));
}
@@ -399,71 +394,71 @@ TEST_F(TouchDispositionGestureFilterTest, EndingEventsNotSent) {
// Consuming a begin event ensures no end events are sent.
PushGesture(ET_GESTURE_SCROLL_BEGIN);
PressTouchPoint(1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_FALSE(GesturesSent());
PushGesture(ET_GESTURE_PINCH_BEGIN);
PressTouchPoint(2, 2);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_FALSE(GesturesSent());
PushGesture(ET_GESTURE_PINCH_END);
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_FALSE(GesturesSent());
PushGesture(ET_GESTURE_SCROLL_END);
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_FALSE(GesturesSent());
}
TEST_F(TouchDispositionGestureFilterTest, UpdateEventsSuppressedPerEvent) {
PushGesture(ET_GESTURE_SCROLL_BEGIN);
PressTouchPoint(1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_BEGIN),
GetAndResetSentGestures()));
// Consuming a single scroll or pinch update should suppress only that event.
PushGesture(ET_GESTURE_SCROLL_UPDATE);
MoveTouchPoint(0, 2, 2);
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_FALSE(GesturesSent());
PushGesture(ET_GESTURE_PINCH_BEGIN);
PressTouchPoint(2, 2);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_PINCH_BEGIN),
GetAndResetSentGestures()));
PushGesture(ET_GESTURE_PINCH_UPDATE);
MoveTouchPoint(1, 2, 3);
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_FALSE(GesturesSent());
// Subsequent updates should not be affected.
PushGesture(ET_GESTURE_SCROLL_UPDATE);
MoveTouchPoint(0, 4, 4);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_UPDATE),
GetAndResetSentGestures()));
PushGesture(ET_GESTURE_PINCH_UPDATE);
MoveTouchPoint(0, 4, 5);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_PINCH_UPDATE),
GetAndResetSentGestures()));
PushGesture(ET_GESTURE_PINCH_END);
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_PINCH_END),
GetAndResetSentGestures()));
PushGesture(ET_GESTURE_SCROLL_END);
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_END),
GetAndResetSentGestures()));
}
@@ -471,34 +466,34 @@ TEST_F(TouchDispositionGestureFilterTest, UpdateEventsSuppressedPerEvent) {
TEST_F(TouchDispositionGestureFilterTest, UpdateEventsDependOnBeginEvents) {
PushGesture(ET_GESTURE_SCROLL_BEGIN);
PressTouchPoint(1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_FALSE(GesturesSent());
// Scroll and pinch gestures depend on the scroll begin gesture being
// dispatched.
PushGesture(ET_GESTURE_SCROLL_UPDATE);
MoveTouchPoint(0, 2, 2);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_FALSE(GesturesSent());
PushGesture(ET_GESTURE_PINCH_BEGIN);
PressTouchPoint(2, 2);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_FALSE(GesturesSent());
PushGesture(ET_GESTURE_PINCH_UPDATE);
MoveTouchPoint(1, 2, 3);
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_FALSE(GesturesSent());
PushGesture(ET_GESTURE_PINCH_END);
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_FALSE(GesturesSent());
PushGesture(ET_GESTURE_SCROLL_END);
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_FALSE(GesturesSent());
}
@@ -514,13 +509,13 @@ TEST_F(TouchDispositionGestureFilterTest, MultipleTouchSequences) {
ReleaseTouchPoint();
// The first gesture sequence should not be allowed.
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchConsumedAck();
+ SendTouchNotConsumedAck();
EXPECT_FALSE(GesturesSent());
// The subsequent sequence should "reset" allowance.
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_BEGIN,
ET_GESTURE_SCROLL_END),
GetAndResetSentGestures()));
@@ -530,22 +525,22 @@ TEST_F(TouchDispositionGestureFilterTest, FlingCancelledOnNewTouchSequence) {
// Simulate a fling.
PushGesture(ET_GESTURE_SCROLL_BEGIN);
PressTouchPoint(1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::NO_CONSUMER_EXISTS);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_BEGIN),
GetAndResetSentGestures()));
PushGesture(ET_SCROLL_FLING_START);
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_SCROLL_FLING_START),
GetAndResetSentGestures()));
// A new touch seqeuence should cancel the outstanding fling.
PressTouchPoint(1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::NO_CONSUMER_EXISTS);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_SCROLL_FLING_CANCEL),
GetAndResetSentGestures()));
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::NO_CONSUMER_EXISTS);
+ SendTouchNotConsumedAck();
EXPECT_FALSE(GesturesSent());
}
@@ -553,15 +548,15 @@ TEST_F(TouchDispositionGestureFilterTest, ScrollEndedOnNewTouchSequence) {
// Simulate a scroll.
PushGesture(ET_GESTURE_SCROLL_BEGIN);
PressTouchPoint(1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::NO_CONSUMER_EXISTS);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_BEGIN),
GetAndResetSentGestures()));
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::NO_CONSUMER_EXISTS);
+ SendTouchNotConsumedAck();
// A new touch seqeuence should end the outstanding scroll.
PressTouchPoint(1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_END),
GetAndResetSentGestures()));
}
@@ -571,7 +566,7 @@ TEST_F(TouchDispositionGestureFilterTest, FlingCancelledOnScrollBegin) {
PushGesture(ET_GESTURE_SCROLL_BEGIN);
PushGesture(ET_SCROLL_FLING_START);
PressTouchPoint(1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_BEGIN,
ET_SCROLL_FLING_START),
GetAndResetSentGestures()));
@@ -580,7 +575,7 @@ TEST_F(TouchDispositionGestureFilterTest, FlingCancelledOnScrollBegin) {
PushGesture(ET_GESTURE_SCROLL_BEGIN);
PushGesture(ET_SCROLL_FLING_START);
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_SCROLL_FLING_CANCEL,
ET_GESTURE_SCROLL_BEGIN,
ET_SCROLL_FLING_START),
@@ -591,13 +586,13 @@ TEST_F(TouchDispositionGestureFilterTest, FlingNotCancelledIfGFCEventReceived) {
// Simulate a fling that is started then cancelled.
PushGesture(ET_GESTURE_SCROLL_BEGIN);
PressTouchPoint(1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::NO_CONSUMER_EXISTS);
+ SendTouchNotConsumedAck();
PushGesture(ET_SCROLL_FLING_START);
MoveTouchPoint(0, 1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::NO_CONSUMER_EXISTS);
+ SendTouchNotConsumedAck();
PushGesture(ET_SCROLL_FLING_CANCEL);
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_BEGIN,
ET_SCROLL_FLING_START,
ET_SCROLL_FLING_CANCEL),
@@ -606,23 +601,23 @@ TEST_F(TouchDispositionGestureFilterTest, FlingNotCancelledIfGFCEventReceived) {
// A new touch sequence will not inject a ET_SCROLL_FLING_CANCEL, as the fling
// has already been cancelled.
PressTouchPoint(1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::NO_CONSUMER_EXISTS);
+ SendTouchNotConsumedAck();
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::NO_CONSUMER_EXISTS);
+ SendTouchNotConsumedAck();
EXPECT_FALSE(GesturesSent());
}
TEST_F(TouchDispositionGestureFilterTest, TapCancelledWhenScrollBegins) {
PushGesture(ET_GESTURE_TAP_DOWN);
PressTouchPoint(1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_TAP_DOWN),
GetAndResetSentGestures()));
// If the subsequent touch turns into a scroll, the tap should be cancelled.
PushGesture(ET_GESTURE_SCROLL_BEGIN);
MoveTouchPoint(0, 2, 2);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_TAP_CANCEL,
ET_GESTURE_SCROLL_BEGIN),
GetAndResetSentGestures()));
@@ -631,14 +626,14 @@ TEST_F(TouchDispositionGestureFilterTest, TapCancelledWhenScrollBegins) {
TEST_F(TouchDispositionGestureFilterTest, TapCancelledWhenTouchConsumed) {
PushGesture(ET_GESTURE_TAP_DOWN);
PressTouchPoint(1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_TAP_DOWN),
GetAndResetSentGestures()));
// If the subsequent touch is consumed, the tap should be cancelled.
PushGesture(ET_GESTURE_SCROLL_BEGIN);
MoveTouchPoint(0, 2, 2);
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_TAP_CANCEL),
GetAndResetSentGestures()));
}
@@ -648,20 +643,20 @@ TEST_F(TouchDispositionGestureFilterTest,
PushGesture(ET_GESTURE_TAP_DOWN);
PressTouchPoint(1, 1);
PressTouchPoint(2, 2);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_TAP_DOWN),
GetAndResetSentGestures()));
PushGesture(ET_GESTURE_TAP);
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_TAP),
GetAndResetSentGestures()));
// The tap should not be cancelled as it was terminated by a |ET_GESTURE_TAP|.
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_FALSE(GesturesSent());
}
@@ -669,7 +664,7 @@ TEST_F(TouchDispositionGestureFilterTest, TimeoutGestures) {
// If the sequence is allowed, and there are no preceding gestures, the
// timeout gestures should be forwarded immediately.
PressTouchPoint(1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_FALSE(GesturesSent());
SendTimeoutGesture(ET_GESTURE_SHOW_PRESS);
@@ -681,18 +676,18 @@ TEST_F(TouchDispositionGestureFilterTest, TimeoutGestures) {
GetAndResetSentGestures()));
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
// If the sequence is disallowed, and there are no preceding gestures, the
// timeout gestures should be dropped immediately.
PressTouchPoint(1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_FALSE(GesturesSent());
SendTimeoutGesture(ET_GESTURE_SHOW_PRESS);
EXPECT_FALSE(GesturesSent());
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
// If the sequence has a pending ack, the timeout gestures should
// remain queued until the ack is received.
@@ -702,7 +697,7 @@ TEST_F(TouchDispositionGestureFilterTest, TimeoutGestures) {
SendTimeoutGesture(ET_GESTURE_LONG_PRESS);
EXPECT_FALSE(GesturesSent());
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_LONG_PRESS),
GetAndResetSentGestures()));
}
@@ -710,15 +705,15 @@ TEST_F(TouchDispositionGestureFilterTest, TimeoutGestures) {
TEST_F(TouchDispositionGestureFilterTest, SpuriousAcksIgnored) {
// Acks received when the queue is empty will be safely ignored.
ASSERT_TRUE(IsEmpty());
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_FALSE(GesturesSent());
PushGesture(ET_GESTURE_SCROLL_BEGIN);
PressTouchPoint(1, 1);
PushGesture(ET_GESTURE_SCROLL_UPDATE);
MoveTouchPoint(0, 3,3);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_SCROLL_BEGIN,
ET_GESTURE_SCROLL_UPDATE),
GetAndResetSentGestures()));
@@ -727,7 +722,7 @@ TEST_F(TouchDispositionGestureFilterTest, SpuriousAcksIgnored) {
// there could be follow-up timeout events. Spurious acks in such cases
// should also be safely ignored.
ASSERT_FALSE(IsEmpty());
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_FALSE(GesturesSent());
}
@@ -749,7 +744,7 @@ TEST_F(TouchDispositionGestureFilterTest, ConsumedTouchCancel) {
PushGesture(ET_GESTURE_TAP_DOWN);
PressTouchPoint(1, 1);
EXPECT_FALSE(GesturesSent());
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_TAP_DOWN),
GetAndResetSentGestures()));
@@ -757,7 +752,7 @@ TEST_F(TouchDispositionGestureFilterTest, ConsumedTouchCancel) {
PushGesture(ET_GESTURE_SCROLL_END);
CancelTouchPoint();
EXPECT_FALSE(GesturesSent());
- SendTouchEventACK(TouchDispositionGestureFilter::CONSUMED);
+ SendTouchConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_TAP_CANCEL,
ET_GESTURE_SCROLL_END),
GetAndResetSentGestures()));
@@ -765,11 +760,11 @@ TEST_F(TouchDispositionGestureFilterTest, ConsumedTouchCancel) {
TEST_F(TouchDispositionGestureFilterTest, TimeoutEventAfterRelease) {
PressTouchPoint(1, 1);
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_FALSE(GesturesSent());
PushGesture(ET_GESTURE_TAP_UNCONFIRMED);
ReleaseTouchPoint();
- SendTouchEventACK(TouchDispositionGestureFilter::NOT_CONSUMED);
+ SendTouchNotConsumedAck();
EXPECT_TRUE(GesturesMatch(Gestures(ET_GESTURE_TAP_UNCONFIRMED),
GetAndResetSentGestures()));
« 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