gestures: Generate only either scroll-end or fling-start events at the end of a scroll gesture.

ui/views/widget/root_view.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 "ui/views/widget/root_view.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 440 matching lines @@
   return status;
 }
 
 ui::GestureStatus RootView::OnGestureEvent(const GestureEvent& event) {
   GestureEvent e(event, this);
   ui::GestureStatus status = ui::GESTURE_STATUS_UNKNOWN;
 
   if (gesture_handler_) {
     // |gesture_handler_| (or |scroll_gesture_handler_|) can be deleted during
     // processing.
-    View* handler = event.IsScrollGestureEvent() && scroll_gesture_handler_ ?
-        scroll_gesture_handler_ : gesture_handler_;
+    View* handler = scroll_gesture_handler_ &&
+        (event.IsScrollGestureEvent() || event.IsFlingScrollEvent())  ?
+            scroll_gesture_handler_ : gesture_handler_;
     GestureEvent handler_event(event, this, handler);
 
     ui::GestureStatus status = handler->ProcessGestureEvent(handler_event);
 
     if (event.type() == ui::ET_GESTURE_END &&
         event.details().touch_points() <= 1)
       gesture_handler_ = NULL;
 
-    if (event.type() == ui::ET_GESTURE_SCROLL_END && scroll_gesture_handler_)
+    if (scroll_gesture_handler_ && (event.type() == ui::ET_GESTURE_SCROLL_END ||
+                                    event.type() == ui::ET_SCROLL_FLING_START))
       scroll_gesture_handler_ = NULL;
 
     if (status == ui::GESTURE_STATUS_CONSUMED)
       return status;
 
     DCHECK_EQ(ui::GESTURE_STATUS_UNKNOWN, status);
 
     if (event.type() == ui::ET_GESTURE_SCROLL_BEGIN &&
         !scroll_gesture_handler_) {
       // Some view started processing gesture events, however it does not
@@ skipping 117 matching lines @@
 }
 
 void RootView::SetMouseLocationAndFlags(const MouseEvent& event) {
   last_mouse_event_flags_ = event.flags();
   last_mouse_event_x_ = event.x();
   last_mouse_event_y_ = event.y();
 }
 
 }  // namespace internal
 }  // namespace views