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

Unified Diff: ui/aura/window_unittest.cc

Issue 10533029: Fix TAP_DOWN gesture event: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed build 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
« no previous file with comments | « ui/aura/root_window_unittest.cc ('k') | ui/base/events.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window_unittest.cc
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index 92520979cf5c03d9e12b918463ff5ee6286f9a63..94c80fef485cbdfec97f40f251e167391cb86a8f 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -626,7 +626,8 @@ TEST_F(WindowTest, TouchCaptureCancelsOtherTouches) {
TouchEvent press(ui::ET_TOUCH_PRESSED,
gfx::Point(10, 10), 0, getTime());
root_window()->DispatchTouchEvent(&press);
- EXPECT_EQ(1, delegate1.gesture_event_count());
+ // We will get both GESTURE_BEGIN and GESTURE_TAP_DOWN.
+ EXPECT_EQ(2, delegate1.gesture_event_count());
delegate1.ResetCounts();
w2->SetCapture();
@@ -658,7 +659,8 @@ TEST_F(WindowTest, TouchCaptureCancelsOtherTouches) {
gfx::Point(10, 10), 0, getTime());
root_window()->DispatchTouchEvent(&press2);
EXPECT_EQ(0, delegate1.gesture_event_count());
- EXPECT_EQ(1, delegate2.gesture_event_count());
+ // We will get both GESTURE_BEGIN and GESTURE_TAP_DOWN.
+ EXPECT_EQ(2, delegate2.gesture_event_count());
}
TEST_F(WindowTest, TouchCaptureDoesntCancelCapturedTouches) {
@@ -670,7 +672,8 @@ TEST_F(WindowTest, TouchCaptureDoesntCancelCapturedTouches) {
gfx::Point(10, 10), 0, getTime());
root_window()->DispatchTouchEvent(&press);
- EXPECT_EQ(1, delegate.gesture_event_count());
+ // We will get both GESTURE_BEGIN and GESTURE_TAP_DOWN.
+ EXPECT_EQ(2, delegate.gesture_event_count());
delegate.ResetCounts();
window->SetCapture();
@@ -694,7 +697,8 @@ TEST_F(WindowTest, TransferCaptureTouchEvents) {
&d1, 0, gfx::Rect(0, 0, 20, 20), NULL));
TouchEvent p1(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 0, getTime());
root_window()->DispatchTouchEvent(&p1);
- EXPECT_EQ(1, d1.gesture_event_count());
+ // We will get both GESTURE_BEGIN and GESTURE_TAP_DOWN.
+ EXPECT_EQ(2, d1.gesture_event_count());
d1.ResetCounts();
// Touch on |w2| with a different id.
@@ -704,7 +708,8 @@ TEST_F(WindowTest, TransferCaptureTouchEvents) {
TouchEvent p2(ui::ET_TOUCH_PRESSED, gfx::Point(41, 10), 1, getTime());
root_window()->DispatchTouchEvent(&p2);
EXPECT_EQ(0, d1.gesture_event_count());
- EXPECT_EQ(1, d2.gesture_event_count());
+ // We will get both GESTURE_BEGIN and GESTURE_TAP_DOWN for new target window.
+ EXPECT_EQ(2, d2.gesture_event_count());
d1.ResetCounts();
d2.ResetCounts();
« no previous file with comments | « ui/aura/root_window_unittest.cc ('k') | ui/base/events.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698