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

Unified Diff: ui/events/gestures/gesture_provider_aura_unittest.cc

Issue 718153002: Indicate whether a touch event will cause scrolling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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/gestures/gesture_provider_aura.cc ('k') | ui/events/gestures/gesture_recognizer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/gestures/gesture_provider_aura_unittest.cc
diff --git a/ui/events/gestures/gesture_provider_aura_unittest.cc b/ui/events/gestures/gesture_provider_aura_unittest.cc
index 0ce3de59ffb1bb53022c9381dcafca4157276e2f..9b52dd3e549038c368fcdea03ad72ea490a6ee22 100644
--- a/ui/events/gestures/gesture_provider_aura_unittest.cc
+++ b/ui/events/gestures/gesture_provider_aura_unittest.cc
@@ -33,30 +33,30 @@ class GestureProviderAuraTest : public testing::Test,
TEST_F(GestureProviderAuraTest, IgnoresExtraPressEvents) {
base::TimeDelta time = ui::EventTimeForNow();
TouchEvent press1(ET_TOUCH_PRESSED, gfx::PointF(10, 10), 0, time);
- EXPECT_TRUE(provider()->OnTouchEvent(press1));
+ EXPECT_TRUE(provider()->OnTouchEvent(&press1));
time += base::TimeDelta::FromMilliseconds(10);
TouchEvent press2(ET_TOUCH_PRESSED, gfx::PointF(30, 40), 0, time);
// Redundant press with same id is ignored.
- EXPECT_FALSE(provider()->OnTouchEvent(press2));
+ EXPECT_FALSE(provider()->OnTouchEvent(&press2));
}
TEST_F(GestureProviderAuraTest, IgnoresExtraMoveOrReleaseEvents) {
base::TimeDelta time = ui::EventTimeForNow();
TouchEvent press1(ET_TOUCH_PRESSED, gfx::PointF(10, 10), 0, time);
- EXPECT_TRUE(provider()->OnTouchEvent(press1));
+ EXPECT_TRUE(provider()->OnTouchEvent(&press1));
time += base::TimeDelta::FromMilliseconds(10);
TouchEvent release1(ET_TOUCH_RELEASED, gfx::PointF(30, 40), 0, time);
- EXPECT_TRUE(provider()->OnTouchEvent(release1));
+ EXPECT_TRUE(provider()->OnTouchEvent(&release1));
time += base::TimeDelta::FromMilliseconds(10);
TouchEvent release2(ET_TOUCH_RELEASED, gfx::PointF(30, 45), 0, time);
- EXPECT_FALSE(provider()->OnTouchEvent(release1));
+ EXPECT_FALSE(provider()->OnTouchEvent(&release1));
time += base::TimeDelta::FromMilliseconds(10);
TouchEvent move1(ET_TOUCH_MOVED, gfx::PointF(70, 75), 0, time);
- EXPECT_FALSE(provider()->OnTouchEvent(move1));
+ EXPECT_FALSE(provider()->OnTouchEvent(&move1));
}
TEST_F(GestureProviderAuraTest, IgnoresIdenticalMoveEvents) {
@@ -69,10 +69,10 @@ TEST_F(GestureProviderAuraTest, IgnoresIdenticalMoveEvents) {
base::TimeDelta time = ui::EventTimeForNow();
TouchEvent press0_1(ET_TOUCH_PRESSED, gfx::PointF(9, 10), kTouchId0, time);
- EXPECT_TRUE(provider()->OnTouchEvent(press0_1));
+ EXPECT_TRUE(provider()->OnTouchEvent(&press0_1));
TouchEvent press1_1(ET_TOUCH_PRESSED, gfx::PointF(40, 40), kTouchId1, time);
- EXPECT_TRUE(provider()->OnTouchEvent(press1_1));
+ EXPECT_TRUE(provider()->OnTouchEvent(&press1_1));
time += base::TimeDelta::FromMilliseconds(10);
TouchEvent move0_1(ET_TOUCH_MOVED,
@@ -84,7 +84,7 @@ TEST_F(GestureProviderAuraTest, IgnoresIdenticalMoveEvents) {
kRadiusY,
kAngle,
kForce);
- EXPECT_TRUE(provider()->OnTouchEvent(move0_1));
+ EXPECT_TRUE(provider()->OnTouchEvent(&move0_1));
TouchEvent move1_1(ET_TOUCH_MOVED,
gfx::PointF(100, 200),
@@ -95,7 +95,7 @@ TEST_F(GestureProviderAuraTest, IgnoresIdenticalMoveEvents) {
kRadiusY,
kAngle,
kForce);
- EXPECT_TRUE(provider()->OnTouchEvent(move1_1));
+ EXPECT_TRUE(provider()->OnTouchEvent(&move1_1));
time += base::TimeDelta::FromMilliseconds(10);
TouchEvent move0_2(ET_TOUCH_MOVED,
@@ -108,7 +108,7 @@ TEST_F(GestureProviderAuraTest, IgnoresIdenticalMoveEvents) {
kAngle,
kForce);
// Nothing has changed, so ignore the move.
- EXPECT_FALSE(provider()->OnTouchEvent(move0_2));
+ EXPECT_FALSE(provider()->OnTouchEvent(&move0_2));
TouchEvent move1_2(ET_TOUCH_MOVED,
gfx::PointF(100, 200),
@@ -120,7 +120,7 @@ TEST_F(GestureProviderAuraTest, IgnoresIdenticalMoveEvents) {
kAngle,
kForce);
// Nothing has changed, so ignore the move.
- EXPECT_FALSE(provider()->OnTouchEvent(move1_2));
+ EXPECT_FALSE(provider()->OnTouchEvent(&move1_2));
time += base::TimeDelta::FromMilliseconds(10);
TouchEvent move0_3(ET_TOUCH_MOVED,
@@ -133,7 +133,7 @@ TEST_F(GestureProviderAuraTest, IgnoresIdenticalMoveEvents) {
kAngle,
kForce);
// Position has changed, so don't ignore the move.
- EXPECT_TRUE(provider()->OnTouchEvent(move0_3));
+ EXPECT_TRUE(provider()->OnTouchEvent(&move0_3));
time += base::TimeDelta::FromMilliseconds(10);
TouchEvent move0_4(ET_TOUCH_MOVED,
@@ -147,4 +147,6 @@ TEST_F(GestureProviderAuraTest, IgnoresIdenticalMoveEvents) {
kForce);
}
+// TODO(jdduke): Test whether event marked as scroll trigger.
+
} // namespace ui
« no previous file with comments | « ui/events/gestures/gesture_provider_aura.cc ('k') | ui/events/gestures/gesture_recognizer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698