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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/aura/gestures/gesture_recognizer_unittest.cc

Issue 10533029: Fix TAP_DOWN gesture event: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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
« content/browser/renderer_host/web_input_event_aurax11.cc ('K') | « content/browser/renderer_host/web_input_event_aurax11.cc ('k') | ui/aura/root_window_unittest.cc » ('j') | ui/base/gestures/gesture_sequence.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/gestures/gesture_recognizer_unittest.cc
diff --git a/ui/aura/gestures/gesture_recognizer_unittest.cc b/ui/aura/gestures/gesture_recognizer_unittest.cc
index cad21ba429a82215aed2b44b51c50d4e0d487720..eaa98c9698b161594f0e0baf5f6529f686660090 100644
--- a/ui/aura/gestures/gesture_recognizer_unittest.cc
+++ b/ui/aura/gestures/gesture_recognizer_unittest.cc
@@ -36,7 +36,8 @@ class GestureEventConsumeDelegate : public TestWindowDelegate {
GestureEventConsumeDelegate()
: tap_(false),
tap_down_(false),
- tap_up_(false),
+ begin_(false),
+ end_(false),
double_tap_(false),
scroll_begin_(false),
scroll_update_(false),
@@ -60,7 +61,8 @@ class GestureEventConsumeDelegate : public TestWindowDelegate {
void Reset() {
tap_ = false;
tap_down_ = false;
- tap_up_ = false;
+ begin_ = false;
+ end_ = false;
double_tap_ = false;
scroll_begin_ = false;
scroll_update_ = false;
@@ -85,7 +87,8 @@ class GestureEventConsumeDelegate : public TestWindowDelegate {
bool tap() const { return tap_; }
bool tap_down() const { return tap_down_; }
- bool tap_up() const { return tap_up_; }
+ bool begin() const { return begin_; }
+ bool end() const { return end_; }
bool double_tap() const { return double_tap_; }
bool scroll_begin() const { return scroll_begin_; }
bool scroll_update() const { return scroll_update_; }
@@ -124,8 +127,11 @@ class GestureEventConsumeDelegate : public TestWindowDelegate {
case ui::ET_GESTURE_TAP_DOWN:
tap_down_ = true;
break;
- case ui::ET_GESTURE_TAP_UP:
- tap_up_ = true;
+ case ui::ET_GESTURE_BEGIN:
+ begin_ = true;
+ break;
+ case ui::ET_GESTURE_END:
+ end_ = true;
break;
case ui::ET_GESTURE_DOUBLE_TAP:
double_tap_ = true;
@@ -173,7 +179,8 @@ class GestureEventConsumeDelegate : public TestWindowDelegate {
private:
bool tap_;
bool tap_down_;
- bool tap_up_;
+ bool begin_;
+ bool end_;
bool double_tap_;
bool scroll_begin_;
bool scroll_update_;
@@ -403,6 +410,7 @@ TEST_F(GestureRecognizerTest, GestureEventTap) {
root_window()->DispatchTouchEvent(&press);
EXPECT_FALSE(delegate->tap());
EXPECT_TRUE(delegate->tap_down());
+ EXPECT_TRUE(delegate->begin());
EXPECT_FALSE(delegate->double_tap());
EXPECT_FALSE(delegate->scroll_begin());
EXPECT_FALSE(delegate->scroll_update());
@@ -419,6 +427,8 @@ TEST_F(GestureRecognizerTest, GestureEventTap) {
root_window()->DispatchTouchEvent(&release);
EXPECT_TRUE(delegate->tap());
EXPECT_FALSE(delegate->tap_down());
+ EXPECT_FALSE(delegate->begin());
+ EXPECT_TRUE(delegate->end());
EXPECT_FALSE(delegate->double_tap());
EXPECT_FALSE(delegate->scroll_begin());
EXPECT_FALSE(delegate->scroll_update());
@@ -447,6 +457,7 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {
root_window()->DispatchTouchEvent(&press);
EXPECT_FALSE(delegate->tap());
EXPECT_TRUE(delegate->tap_down());
+ EXPECT_TRUE(delegate->begin());
EXPECT_FALSE(delegate->double_tap());
EXPECT_FALSE(delegate->scroll_begin());
EXPECT_FALSE(delegate->scroll_update());
@@ -465,6 +476,8 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {
root_window()->DispatchTouchEvent(&release);
EXPECT_TRUE(delegate->tap());
EXPECT_FALSE(delegate->tap_down());
+ EXPECT_FALSE(delegate->begin());
+ EXPECT_TRUE(delegate->end());
EXPECT_FALSE(delegate->double_tap());
EXPECT_FALSE(delegate->scroll_begin());
EXPECT_FALSE(delegate->scroll_update());
@@ -487,6 +500,7 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {
root_window()->DispatchTouchEvent(&press);
EXPECT_FALSE(delegate->tap());
EXPECT_TRUE(delegate->tap_down());
+ EXPECT_TRUE(delegate->begin());
EXPECT_FALSE(delegate->double_tap());
EXPECT_FALSE(delegate->scroll_begin());
EXPECT_FALSE(delegate->scroll_update());
@@ -503,6 +517,8 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {
root_window()->DispatchTouchEvent(&release);
EXPECT_TRUE(delegate->tap());
EXPECT_FALSE(delegate->tap_down());
+ EXPECT_FALSE(delegate->begin());
+ EXPECT_TRUE(delegate->end());
EXPECT_FALSE(delegate->double_tap());
EXPECT_FALSE(delegate->scroll_begin());
EXPECT_FALSE(delegate->scroll_update());
@@ -525,6 +541,7 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {
root_window()->DispatchTouchEvent(&press);
EXPECT_FALSE(delegate->tap());
EXPECT_TRUE(delegate->tap_down());
+ EXPECT_TRUE(delegate->begin());
EXPECT_FALSE(delegate->double_tap());
EXPECT_FALSE(delegate->scroll_begin());
EXPECT_FALSE(delegate->scroll_update());
@@ -540,6 +557,7 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {
root_window()->DispatchTouchEvent(&move);
EXPECT_FALSE(delegate->tap());
EXPECT_FALSE(delegate->tap_down());
+ EXPECT_FALSE(delegate->begin());
EXPECT_FALSE(delegate->double_tap());
EXPECT_FALSE(delegate->scroll_begin());
EXPECT_FALSE(delegate->scroll_update());
@@ -556,6 +574,8 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {
root_window()->DispatchTouchEvent(&release);
EXPECT_TRUE(delegate->tap());
EXPECT_FALSE(delegate->tap_down());
+ EXPECT_FALSE(delegate->begin());
+ EXPECT_TRUE(delegate->end());
EXPECT_FALSE(delegate->double_tap());
EXPECT_FALSE(delegate->scroll_begin());
EXPECT_FALSE(delegate->scroll_update());
@@ -578,6 +598,7 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {
root_window()->DispatchTouchEvent(&press);
EXPECT_FALSE(delegate->tap());
EXPECT_TRUE(delegate->tap_down());
+ EXPECT_TRUE(delegate->begin());
EXPECT_FALSE(delegate->double_tap());
EXPECT_FALSE(delegate->scroll_begin());
EXPECT_FALSE(delegate->scroll_update());
@@ -593,6 +614,7 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {
root_window()->DispatchTouchEvent(&move);
EXPECT_FALSE(delegate->tap());
EXPECT_FALSE(delegate->tap_down());
+ EXPECT_FALSE(delegate->begin());
EXPECT_FALSE(delegate->double_tap());
EXPECT_FALSE(delegate->scroll_begin());
EXPECT_FALSE(delegate->scroll_update());
@@ -608,6 +630,7 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {
root_window()->DispatchTouchEvent(&move1);
EXPECT_FALSE(delegate->tap());
EXPECT_FALSE(delegate->tap_down());
+ EXPECT_FALSE(delegate->begin());
EXPECT_FALSE(delegate->double_tap());
EXPECT_FALSE(delegate->scroll_begin());
EXPECT_FALSE(delegate->scroll_update());
@@ -623,6 +646,7 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {
root_window()->DispatchTouchEvent(&move2);
EXPECT_FALSE(delegate->tap());
EXPECT_FALSE(delegate->tap_down());
+ EXPECT_FALSE(delegate->begin());
EXPECT_FALSE(delegate->double_tap());
EXPECT_FALSE(delegate->scroll_begin());
EXPECT_FALSE(delegate->scroll_update());
@@ -639,6 +663,8 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {
root_window()->DispatchTouchEvent(&release);
EXPECT_TRUE(delegate->tap());
EXPECT_FALSE(delegate->tap_down());
+ EXPECT_FALSE(delegate->begin());
+ EXPECT_TRUE(delegate->end());
EXPECT_FALSE(delegate->double_tap());
EXPECT_FALSE(delegate->scroll_begin());
EXPECT_FALSE(delegate->scroll_update());
@@ -669,6 +695,7 @@ TEST_F(GestureRecognizerTest, GestureEventScroll) {
root_window()->DispatchTouchEvent(&press);
EXPECT_FALSE(delegate->tap());
EXPECT_TRUE(delegate->tap_down());
+ EXPECT_TRUE(delegate->begin());
EXPECT_FALSE(delegate->double_tap());
EXPECT_FALSE(delegate->scroll_begin());
EXPECT_FALSE(delegate->scroll_update());
@@ -681,6 +708,7 @@ TEST_F(GestureRecognizerTest, GestureEventScroll) {
SendScrollEvent(root_window(), 130, 230, kTouchId, delegate.get());
EXPECT_FALSE(delegate->tap());
EXPECT_FALSE(delegate->tap_down());
+ EXPECT_FALSE(delegate->begin());
EXPECT_FALSE(delegate->double_tap());
EXPECT_TRUE(delegate->scroll_begin());
EXPECT_TRUE(delegate->scroll_update());
@@ -694,6 +722,7 @@ TEST_F(GestureRecognizerTest, GestureEventScroll) {
SendScrollEvent(root_window(), 110, 211, kTouchId, delegate.get());
EXPECT_FALSE(delegate->tap());
EXPECT_FALSE(delegate->tap_down());
+ EXPECT_FALSE(delegate->begin());
EXPECT_FALSE(delegate->double_tap());
EXPECT_FALSE(delegate->scroll_begin());
EXPECT_TRUE(delegate->scroll_update());
@@ -704,6 +733,7 @@ TEST_F(GestureRecognizerTest, GestureEventScroll) {
SendScrollEvent(root_window(), 140, 215, kTouchId, delegate.get());
EXPECT_FALSE(delegate->tap());
EXPECT_FALSE(delegate->tap_down());
+ EXPECT_FALSE(delegate->begin());
EXPECT_FALSE(delegate->double_tap());
EXPECT_FALSE(delegate->scroll_begin());
EXPECT_TRUE(delegate->scroll_update());
@@ -719,6 +749,8 @@ TEST_F(GestureRecognizerTest, GestureEventScroll) {
root_window()->DispatchTouchEvent(&release);
EXPECT_FALSE(delegate->tap());
EXPECT_FALSE(delegate->tap_down());
+ EXPECT_FALSE(delegate->begin());
+ EXPECT_TRUE(delegate->end());
EXPECT_FALSE(delegate->double_tap());
EXPECT_FALSE(delegate->scroll_begin());
EXPECT_FALSE(delegate->scroll_update());
@@ -856,6 +888,7 @@ TEST_F(GestureRecognizerTest, GestureEventLongPress) {
kTouchId, GetTime());
root_window()->DispatchTouchEvent(&press1);
EXPECT_TRUE(delegate->tap_down());
+ EXPECT_TRUE(delegate->begin());
// We haven't pressed long enough for a long press to occur
EXPECT_FALSE(delegate->long_press());
@@ -939,6 +972,7 @@ TEST_F(GestureRecognizerTest, GestureEventLongPressCancelledBySecondTap) {
kTouchId1, GetTime());
root_window()->DispatchTouchEvent(&press);
EXPECT_TRUE(delegate->tap_down());
+ EXPECT_TRUE(delegate->begin());
// We haven't pressed long enough for a long press to occur
EXPECT_FALSE(delegate->long_press());
@@ -949,6 +983,7 @@ TEST_F(GestureRecognizerTest, GestureEventLongPressCancelledBySecondTap) {
kTouchId2, GetTime());
root_window()->DispatchTouchEvent(&press2);
EXPECT_FALSE(delegate->tap_down()); // no touch down for second tap.
+ EXPECT_TRUE(delegate->begin());
// Wait until the timer runs out
gesture_sequence->ForceTimeout();
@@ -1212,6 +1247,7 @@ TEST_F(GestureRecognizerTest, AsynchronousGestureRecognition) {
root_window()->DispatchTouchEvent(&press);
EXPECT_FALSE(queued_delegate->tap());
EXPECT_FALSE(queued_delegate->tap_down());
+ EXPECT_FALSE(queued_delegate->begin());
EXPECT_FALSE(queued_delegate->double_tap());
EXPECT_FALSE(queued_delegate->scroll_begin());
EXPECT_FALSE(queued_delegate->scroll_update());
@@ -1226,6 +1262,8 @@ TEST_F(GestureRecognizerTest, AsynchronousGestureRecognition) {
root_window()->DispatchTouchEvent(&release);
EXPECT_FALSE(queued_delegate->tap());
EXPECT_FALSE(queued_delegate->tap_down());
+ EXPECT_FALSE(queued_delegate->begin());
+ EXPECT_FALSE(queued_delegate->end());
EXPECT_FALSE(queued_delegate->double_tap());
EXPECT_FALSE(queued_delegate->scroll_begin());
EXPECT_FALSE(queued_delegate->scroll_update());
@@ -1243,6 +1281,8 @@ TEST_F(GestureRecognizerTest, AsynchronousGestureRecognition) {
root_window()->DispatchTouchEvent(&press2);
EXPECT_FALSE(delegate->tap());
EXPECT_TRUE(delegate->tap_down());
+ EXPECT_FALSE(queued_delegate->begin());
+ EXPECT_FALSE(queued_delegate->end());
EXPECT_FALSE(delegate->double_tap());
EXPECT_FALSE(delegate->scroll_begin());
EXPECT_FALSE(delegate->scroll_update());
@@ -1257,6 +1297,8 @@ TEST_F(GestureRecognizerTest, AsynchronousGestureRecognition) {
queued_delegate->ReceivedAck();
EXPECT_FALSE(queued_delegate->tap());
EXPECT_TRUE(queued_delegate->tap_down());
+ EXPECT_TRUE(queued_delegate->begin());
+ EXPECT_FALSE(queued_delegate->end());
EXPECT_FALSE(queued_delegate->double_tap());
EXPECT_FALSE(queued_delegate->scroll_begin());
EXPECT_FALSE(queued_delegate->scroll_update());
@@ -1267,6 +1309,8 @@ TEST_F(GestureRecognizerTest, AsynchronousGestureRecognition) {
queued_delegate->ReceivedAck();
EXPECT_TRUE(queued_delegate->tap());
EXPECT_FALSE(queued_delegate->tap_down());
+ EXPECT_FALSE(queued_delegate->begin());
+ EXPECT_TRUE(queued_delegate->end());
EXPECT_FALSE(queued_delegate->double_tap());
EXPECT_FALSE(queued_delegate->scroll_begin());
EXPECT_FALSE(queued_delegate->scroll_update());
@@ -1280,6 +1324,10 @@ TEST_F(GestureRecognizerTest, AsynchronousGestureRecognition) {
root_window()->DispatchTouchEvent(&press3);
EXPECT_FALSE(queued_delegate->tap());
EXPECT_FALSE(queued_delegate->tap_down());
+ EXPECT_FALSE(queued_delegate->begin());
+ EXPECT_FALSE(queued_delegate->end());
+ EXPECT_FALSE(queued_delegate->begin());
+ EXPECT_FALSE(queued_delegate->end());
EXPECT_FALSE(queued_delegate->double_tap());
EXPECT_FALSE(queued_delegate->scroll_begin());
EXPECT_FALSE(queued_delegate->scroll_update());
@@ -1292,12 +1340,16 @@ TEST_F(GestureRecognizerTest, AsynchronousGestureRecognition) {
root_window()->DispatchTouchEvent(&press4);
EXPECT_FALSE(delegate->tap());
EXPECT_FALSE(delegate->tap_down());
+ EXPECT_FALSE(delegate->begin());
+ EXPECT_FALSE(delegate->end());
EXPECT_FALSE(delegate->double_tap());
EXPECT_FALSE(delegate->scroll_begin());
EXPECT_FALSE(delegate->scroll_update());
EXPECT_FALSE(delegate->scroll_end());
EXPECT_FALSE(queued_delegate->tap());
EXPECT_FALSE(queued_delegate->tap_down());
+ EXPECT_FALSE(queued_delegate->begin());
+ EXPECT_FALSE(queued_delegate->end());
EXPECT_FALSE(queued_delegate->double_tap());
EXPECT_FALSE(queued_delegate->scroll_begin());
EXPECT_FALSE(queued_delegate->scroll_update());
@@ -1313,12 +1365,14 @@ TEST_F(GestureRecognizerTest, AsynchronousGestureRecognition) {
root_window()->DispatchTouchEvent(&move);
EXPECT_FALSE(delegate->tap());
EXPECT_FALSE(delegate->tap_down());
+ EXPECT_FALSE(delegate->begin());
EXPECT_FALSE(delegate->double_tap());
EXPECT_FALSE(delegate->scroll_begin());
EXPECT_FALSE(delegate->scroll_update());
EXPECT_FALSE(delegate->scroll_end());
EXPECT_FALSE(queued_delegate->tap());
EXPECT_FALSE(queued_delegate->tap_down());
+ EXPECT_FALSE(queued_delegate->begin());
EXPECT_FALSE(queued_delegate->double_tap());
EXPECT_FALSE(queued_delegate->scroll_begin());
EXPECT_FALSE(queued_delegate->scroll_update());
@@ -1328,6 +1382,8 @@ TEST_F(GestureRecognizerTest, AsynchronousGestureRecognition) {
queued_delegate->ReceivedAck();
EXPECT_FALSE(queued_delegate->tap());
EXPECT_TRUE(queued_delegate->tap_down());
+ EXPECT_TRUE(queued_delegate->begin());
+ EXPECT_FALSE(queued_delegate->end());
EXPECT_FALSE(queued_delegate->double_tap());
EXPECT_FALSE(queued_delegate->scroll_begin());
EXPECT_FALSE(queued_delegate->scroll_update());
@@ -1337,6 +1393,8 @@ TEST_F(GestureRecognizerTest, AsynchronousGestureRecognition) {
queued_delegate->ReceivedAck();
EXPECT_FALSE(queued_delegate->tap());
EXPECT_FALSE(queued_delegate->tap_down()); // no touch down for second tap.
+ EXPECT_TRUE(queued_delegate->begin());
+ EXPECT_FALSE(queued_delegate->end());
EXPECT_FALSE(queued_delegate->double_tap());
EXPECT_FALSE(queued_delegate->scroll_begin());
EXPECT_FALSE(queued_delegate->scroll_update());
@@ -1349,6 +1407,8 @@ TEST_F(GestureRecognizerTest, AsynchronousGestureRecognition) {
queued_delegate->ReceivedAck();
EXPECT_FALSE(queued_delegate->tap());
EXPECT_FALSE(queued_delegate->tap_down());
+ EXPECT_FALSE(queued_delegate->begin());
+ EXPECT_FALSE(queued_delegate->end());
EXPECT_FALSE(queued_delegate->double_tap());
EXPECT_TRUE(queued_delegate->scroll_begin());
EXPECT_FALSE(queued_delegate->scroll_update());
@@ -1782,7 +1842,7 @@ TEST_F(GestureRecognizerTest, CaptureSendsTapUp) {
capture->SetCapture();
RunAllPendingInMessageLoop();
- EXPECT_TRUE(delegate->tap_up());
+ EXPECT_TRUE(delegate->end());
}
TEST_F(GestureRecognizerTest, TwoFingerTap) {
« content/browser/renderer_host/web_input_event_aurax11.cc ('K') | « content/browser/renderer_host/web_input_event_aurax11.cc ('k') | ui/aura/root_window_unittest.cc » ('j') | ui/base/gestures/gesture_sequence.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698