Postpone rail application for touch scrolling - chrome side.

ui/events/gesture_detection/snap_scroll_controller_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/gesture_detection/snap_scroll_controller.h"
 #include "ui/events/test/motion_event_test_utils.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
 using ui::test::MockMotionEvent;
 
 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);
 }
 
 }  // namespace
 
 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);
 
   // 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