Postpone rail application for touch scrolling - chrome side.

ui/events/gesture_detection/gesture_provider_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 "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 821 matching lines @@
   ASSERT_LT(0U, GetReceivedGestureCount());
   GestureEventData gesture = GetMostRecentGestureEvent();
   EXPECT_EQ(ET_GESTURE_SCROLL_UPDATE, gesture.type());
   EXPECT_EQ(event_time + kOneMicrosecond * 2, gesture.time);
   EXPECT_EQ(kFakeCoordX - delta_x, gesture.x);
   EXPECT_EQ(kFakeCoordY - delta_y, gesture.y);
   EXPECT_EQ(kFakeCoordX - delta_x + raw_offset_x, gesture.raw_x);
   EXPECT_EQ(kFakeCoordY - delta_y + raw_offset_y, gesture.raw_y);
   EXPECT_EQ(1, gesture.details.touch_points());
 
-  // No horizontal delta because of snapping.
-  EXPECT_EQ(0, gesture.details.scroll_x());
+  EXPECT_EQ(-delta_x / 2, gesture.details.scroll_x());
   EXPECT_EQ(-delta_y / 2, gesture.details.scroll_y());
+  EXPECT_EQ(GestureEventDetails::ScrollRailState::Vertical,
+            gesture.details.scroll_rail_state());
 }
 
 // Verify that fractional scroll deltas are rounded as expected and that
 // fractional scrolling doesn't break scroll snapping.
 TEST_F(GestureProviderTest, FractionalScroll) {
   const float delta_x = 0.4f;
   const float delta_y = 5.2f;
 
   const base::TimeTicks event_time = TimeTicks::Now();
 
@@ skipping 29 matching lines @@
     // Verify that the event co-ordinates are still the precise values we
     // supplied.
     EXPECT_EQ(kFakeCoordX + delta_x * i, gesture.x);
     EXPECT_FLOAT_EQ(kFakeCoordY + delta_y * i, gesture.y);
 
     // Verify that we're scrolling vertically by the expected amount
     // (modulo rounding).
     EXPECT_GE(gesture.details.scroll_y(), (int)delta_y);
     EXPECT_LE(gesture.details.scroll_y(), ((int)delta_y) + 1);
 
-    // And that there has been no horizontal motion at all.
-    EXPECT_EQ(0, gesture.details.scroll_x());
+    // And that there has been very little horizontal motion.
+    EXPECT_GT(gesture.details.scroll_x(), 0);
+    EXPECT_LT(gesture.details.scroll_x(), 0.5);
+    EXPECT_EQ(GestureEventDetails::ScrollRailState::Vertical,
+              gesture.details.scroll_rail_state());
   }
 }
 
 // Generate a scroll gesture and verify that the resulting scroll begin event
 // has the expected hint values.
 TEST_F(GestureProviderTest, ScrollBeginValues) {
   const float delta_x = 13;
   const float delta_y = 89;
 
   const base::TimeTicks event_time = TimeTicks::Now();
@@ skipping 1614 matching lines @@
   EXPECT_TRUE(gesture_provider_->OnTouchEvent(event));
   EXPECT_EQ(ET_GESTURE_TAP, GetMostRecentGestureEventType());
 
   EXPECT_EQ(1, GetMostRecentGestureEvent().details.tap_count());
   EXPECT_EQ(1, GetMostRecentGestureEvent().details.touch_points());
   EXPECT_EQ(gfx::RectF(0, 0, 20, 20),
             GetMostRecentGestureEvent().details.bounding_box());
 }
 
 }  // namespace ui