GestureScrollEnd event had non-zero velocity causing overscroll on software fling path.

ui/aura/gestures/gesture_recognizer_unittest.cc

 // Copyright (c) 2012 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/memory/scoped_vector.h"
 #include "base/string_number_conversions.h"
 #include "base/timer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
@@ skipping 112 matching lines @@
       case ui::ET_GESTURE_SCROLL_BEGIN:
         scroll_begin_ = true;
         scroll_begin_position_ = gesture->location();
         break;
       case ui::ET_GESTURE_SCROLL_UPDATE:
         scroll_update_ = true;
         scroll_x_ += gesture->delta_x();
         scroll_y_ += gesture->delta_y();
         break;
       case ui::ET_GESTURE_SCROLL_END:
-        velocity_x_ = gesture->delta_x();
-        velocity_y_ = gesture->delta_y();
+        EXPECT_TRUE(velocity_x_ == 0 && velocity_y_ == 0);
         scroll_end_ = true;
         break;
       case ui::ET_GESTURE_PINCH_BEGIN:
         pinch_begin_ = true;
         break;
       case ui::ET_GESTURE_PINCH_UPDATE:
         pinch_update_ = true;
         break;
       case ui::ET_GESTURE_PINCH_END:
         pinch_end_ = true;
         break;
       case ui::ET_GESTURE_LONG_PRESS:
         long_press_ = true;
         touch_id_ = gesture->delta_x();
         break;
       case ui::ET_SCROLL_FLING_START:
+        EXPECT_TRUE(gesture->delta_x() != 0 || gesture->delta_y() != 0);
         EXPECT_TRUE(scroll_end_);
-        EXPECT_TRUE(velocity_x_ != 0 || velocity_y_ != 0);
         fling_ = true;
         break;
       case ui::ET_GESTURE_TAP_UP:
         break;
       default:
         NOTREACHED();
     }
     return ui::GESTURE_STATUS_CONSUMED;
   }
 
@@ skipping 575 matching lines @@
                    100, 10, kTouchId, 1,
                    ui::GestureConfiguration::points_buffered_for_velocity(),
                    delegate.get());
 
   delegate->Reset();
   TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),
                      kTouchId, GetTime());
   root_window()->DispatchTouchEvent(&release);
 
   EXPECT_TRUE(delegate->scroll_end());
-  EXPECT_EQ(100000, delegate->velocity_x());
+  EXPECT_EQ(0, delegate->velocity_x());
   EXPECT_EQ(0, delegate->velocity_y());
 }
 
 // Check Scroll End Events report correct velocities
 // if the user was on a vertical rail
 TEST_F(GestureRecognizerTest, GestureEventVerticalRailFling) {
   scoped_ptr<GestureEventConsumeDelegate> delegate(
       new GestureEventConsumeDelegate());
   const int kTouchId = 7;
   gfx::Rect bounds(0, 0, 1000, 1000);
@@ skipping 16 matching lines @@
                    ui::GestureConfiguration::points_buffered_for_velocity(),
                    delegate.get());
 
   delegate->Reset();
   TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),
                      kTouchId, GetTime());
   root_window()->DispatchTouchEvent(&release);
 
   EXPECT_TRUE(delegate->scroll_end());
   EXPECT_EQ(0, delegate->velocity_x());
-  EXPECT_EQ(100000, delegate->velocity_y());
+  EXPECT_EQ(0, delegate->velocity_y());
 }
 
-// Check Scroll End Events report correct velocities
+// Check Scroll End Events reports zero velocities
 // if the user is not on a rail
 TEST_F(GestureRecognizerTest, GestureEventNonRailFling) {
   scoped_ptr<GestureEventConsumeDelegate> delegate(
       new GestureEventConsumeDelegate());
   const int kTouchId = 7;
   gfx::Rect bounds(0, 0, 1000, 1000);
   scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       delegate.get(), -1234, bounds, NULL));
 
   TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0),
                    kTouchId, GetTime());
   root_window()->DispatchTouchEvent(&press);
 
   // Move the touch-point such that a non-rail scroll begins
   SendScrollEvent(root_window(), 20, 20, kTouchId, delegate.get());
   EXPECT_EQ(20, delegate->scroll_y());
   EXPECT_EQ(20, delegate->scroll_x());
 
   SendScrollEvents(root_window(), 1, 1, press.time_stamp(),
                    10, 100, kTouchId, 1,
                    ui::GestureConfiguration::points_buffered_for_velocity(),
                    delegate.get());
 
   delegate->Reset();
   TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),
                      kTouchId, GetTime());
   root_window()->DispatchTouchEvent(&release);
 
   EXPECT_TRUE(delegate->scroll_end());
-  EXPECT_EQ(10000, delegate->velocity_x());
-  EXPECT_EQ(100000, delegate->velocity_y());
+  EXPECT_EQ(0, delegate->velocity_x());
+  EXPECT_EQ(0, delegate->velocity_y());
 }
 
 // Check that appropriate touch events generate long press events
 TEST_F(GestureRecognizerTest, GestureEventLongPress) {
   scoped_ptr<GestureEventConsumeDelegate> delegate(
       new GestureEventConsumeDelegate());
   const int kWindowWidth = 123;
   const int kWindowHeight = 45;
   const int kTouchId = 2;
   gfx::Rect bounds(100, 200, kWindowWidth, kWindowHeight);
@@ skipping 872 matching lines @@
   delegate->Reset();
   delegate->ReceivedAck();
   EXPECT_TRUE(delegate->tap_down());
   delegate->Reset();
   delegate->ReceivedAckPreventDefaulted();
   EXPECT_FALSE(delegate->tap());
 }
 
 }  // namespace test
 }  // namespace aura