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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1049383003: Postpone rail application for touch scrolling - chrome side. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
« ui/events/gesture_detection/gesture_provider.cc ('K') | « ui/events/gesture_detection/snap_scroll_controller.cc ('k') | ui/events/gesture_event_details.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/gesture_detection/snap_scroll_controller_unittest.cc
diff --git a/ui/events/gesture_detection/snap_scroll_controller_unittest.cc b/ui/events/gesture_detection/snap_scroll_controller_unittest.cc
index 7a0b231982bc465175bfd418c8a766c65259de49..2ab281c8e296ce8b36702f886158d6dcb5b6c74d 100644
--- a/ui/events/gesture_detection/snap_scroll_controller_unittest.cc
+++ b/ui/events/gesture_detection/snap_scroll_controller_unittest.cc
@@ -15,6 +15,12 @@ namespace ui {
namespace {
const float kSnapBound = 8.f;
+const GestureEventDetails::ScrollRailState kFree =
+ GestureEventDetails::ScrollRailState::Free;
+const GestureEventDetails::ScrollRailState kHorizontal =
+ GestureEventDetails::ScrollRailState::Horizontal;
+const GestureEventDetails::ScrollRailState kVertical =
+ GestureEventDetails::ScrollRailState::Vertical;
gfx::SizeF GetDisplayBounds() {
return gfx::SizeF(640, 480);
@@ -24,21 +30,17 @@ gfx::SizeF GetDisplayBounds() {
TEST(SnapScrollControllerTest, Basic) {
SnapScrollController controller(kSnapBound, GetDisplayBounds());
- EXPECT_FALSE(controller.IsSnappingScrolls());
- EXPECT_FALSE(controller.IsSnapHorizontal());
- EXPECT_FALSE(controller.IsSnapVertical());
+ EXPECT_EQ(kFree, controller.ScrollRailState());
// Test basic horizontal snapping.
MockMotionEvent event;
event.PressPoint(0, 0);
controller.SetSnapScrollMode(event, false);
- EXPECT_FALSE(controller.IsSnappingScrolls());
+ EXPECT_EQ(kFree, controller.ScrollRailState());
event.MovePoint(0, kSnapBound * 2, 0.f);
controller.SetSnapScrollMode(event, false);
- EXPECT_TRUE(controller.IsSnappingScrolls());
- EXPECT_TRUE(controller.IsSnapHorizontal());
- EXPECT_FALSE(controller.IsSnapVertical());
+ EXPECT_EQ(kHorizontal, controller.ScrollRailState());
event.ReleasePoint();
controller.SetSnapScrollMode(event, false);
@@ -46,123 +48,115 @@ TEST(SnapScrollControllerTest, Basic) {
// Test basic vertical snapping.
event.PressPoint(0, 0);
controller.SetSnapScrollMode(event, false);
- EXPECT_FALSE(controller.IsSnappingScrolls());
+ EXPECT_EQ(kFree, controller.ScrollRailState());
event.MovePoint(0, 0.f, kSnapBound * 2);
controller.SetSnapScrollMode(event, false);
- EXPECT_TRUE(controller.IsSnappingScrolls());
- EXPECT_TRUE(controller.IsSnapVertical());
- EXPECT_FALSE(controller.IsSnapHorizontal());
+ EXPECT_EQ(kVertical, controller.ScrollRailState());
}
TEST(SnapScrollControllerTest, VerticalScroll) {
SnapScrollController controller(kSnapBound, GetDisplayBounds());
- EXPECT_FALSE(controller.IsSnappingScrolls());
+ EXPECT_EQ(kFree, controller.ScrollRailState());
MockMotionEvent event;
event.PressPoint(0, 0);
controller.SetSnapScrollMode(event, false);
- EXPECT_FALSE(controller.IsSnappingScrolls());
+ EXPECT_EQ(kFree, controller.ScrollRailState());
event.MovePoint(0, 0.f, -kSnapBound / 2.f);
controller.SetSnapScrollMode(event, false);
- EXPECT_FALSE(controller.IsSnappingScrolls());
+ EXPECT_EQ(kFree, controller.ScrollRailState());
event.MovePoint(0, kSnapBound / 2.f, -kSnapBound * 2.f);
controller.SetSnapScrollMode(event, false);
- EXPECT_TRUE(controller.IsSnapVertical());
- EXPECT_FALSE(controller.IsSnapHorizontal());
+ EXPECT_EQ(kVertical, controller.ScrollRailState());
// Initial scrolling should be snapped.
float delta_x = event.GetX(0);
float delta_y = event.GetY(0);
controller.UpdateSnapScrollMode(delta_x, delta_y);
- EXPECT_TRUE(controller.IsSnapVertical());
- EXPECT_FALSE(controller.IsSnapHorizontal());
+ EXPECT_EQ(kVertical, controller.ScrollRailState());
// Subsequent scrolling should be snapped as long as it's within the rails.
delta_x = 5;
delta_y = 10;
controller.UpdateSnapScrollMode(delta_x, delta_y);
- EXPECT_TRUE(controller.IsSnapVertical());
- EXPECT_FALSE(controller.IsSnapHorizontal());
+ EXPECT_EQ(kVertical, controller.ScrollRailState());
// Large horizontal movement should end snapping.
delta_x = 100;
delta_y = 10;
controller.UpdateSnapScrollMode(delta_x, delta_y);
- EXPECT_FALSE(controller.IsSnappingScrolls());
+ EXPECT_EQ(kFree, controller.ScrollRailState());
}
TEST(SnapScrollControllerTest, HorizontalScroll) {
SnapScrollController controller(kSnapBound, GetDisplayBounds());
- EXPECT_FALSE(controller.IsSnappingScrolls());
+ EXPECT_EQ(kFree, controller.ScrollRailState());
MockMotionEvent event;
event.PressPoint(0, 0);
controller.SetSnapScrollMode(event, false);
- EXPECT_FALSE(controller.IsSnappingScrolls());
+ EXPECT_EQ(kFree, controller.ScrollRailState());
event.MovePoint(0, -kSnapBound / 2.f, 0.f);
controller.SetSnapScrollMode(event, false);
- EXPECT_FALSE(controller.IsSnappingScrolls());
+ EXPECT_EQ(kFree, controller.ScrollRailState());
event.MovePoint(0, kSnapBound * 2.f, kSnapBound / 2.f);
controller.SetSnapScrollMode(event, false);
- EXPECT_TRUE(controller.IsSnapHorizontal());
- EXPECT_FALSE(controller.IsSnapVertical());
+ EXPECT_EQ(kHorizontal, controller.ScrollRailState());
// Initial scrolling should be snapped.
float delta_x = event.GetX(0);
float delta_y = event.GetY(0);
controller.UpdateSnapScrollMode(delta_x, delta_y);
- EXPECT_TRUE(controller.IsSnapHorizontal());
- EXPECT_FALSE(controller.IsSnapVertical());
+ EXPECT_EQ(kHorizontal, controller.ScrollRailState());
// Subsequent scrolling should be snapped as long as it's within the rails.
delta_x = 10;
delta_y = 5;
controller.UpdateSnapScrollMode(delta_x, delta_y);
- EXPECT_TRUE(controller.IsSnapHorizontal());
- EXPECT_FALSE(controller.IsSnapVertical());
+ EXPECT_EQ(kHorizontal, controller.ScrollRailState());
// Large vertical movement should end snapping.
delta_x = 10;
delta_y = 100;
controller.UpdateSnapScrollMode(delta_x, delta_y);
- EXPECT_FALSE(controller.IsSnappingScrolls());
+ EXPECT_EQ(kFree, controller.ScrollRailState());
}
TEST(SnapScrollControllerTest, Diagonal) {
SnapScrollController controller(kSnapBound, GetDisplayBounds());
- EXPECT_FALSE(controller.IsSnappingScrolls());
+ EXPECT_EQ(kFree, controller.ScrollRailState());
MockMotionEvent event;
event.PressPoint(0, 0);
controller.SetSnapScrollMode(event, false);
- EXPECT_FALSE(controller.IsSnappingScrolls());
+ EXPECT_EQ(kFree, controller.ScrollRailState());
// Sufficient initial diagonal motion will prevent any future snapping.
event.MovePoint(0, kSnapBound * 3.f, -kSnapBound * 3.f);
controller.SetSnapScrollMode(event, false);
- EXPECT_FALSE(controller.IsSnappingScrolls());
+ EXPECT_EQ(kFree, controller.ScrollRailState());
float delta_x = event.GetX(0);
float delta_y = event.GetY(0);
controller.UpdateSnapScrollMode(delta_x, delta_y);
- EXPECT_FALSE(controller.IsSnappingScrolls());
+ EXPECT_EQ(kFree, controller.ScrollRailState());
event.MovePoint(0, 0, 0);
controller.SetSnapScrollMode(event, false);
- EXPECT_FALSE(controller.IsSnappingScrolls());
+ EXPECT_EQ(kFree, controller.ScrollRailState());
event.MovePoint(0, kSnapBound * 5, 0);
controller.SetSnapScrollMode(event, false);
- EXPECT_FALSE(controller.IsSnappingScrolls());
+ EXPECT_EQ(kFree, controller.ScrollRailState());
event.MovePoint(0, 0, -kSnapBound * 5);
controller.SetSnapScrollMode(event, false);
- EXPECT_FALSE(controller.IsSnappingScrolls());
+ EXPECT_EQ(kFree, controller.ScrollRailState());
}
} // namespace ui
« ui/events/gesture_detection/gesture_provider.cc ('K') | « ui/events/gesture_detection/snap_scroll_controller.cc ('k') | ui/events/gesture_event_details.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698