gesture recognizer: Reset velocities of the fingers after a pinch-end/swipe-end.

ui/base/gestures/gesture_sequence.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/base/gestures/gesture_sequence.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 251 matching lines @@
     case GST_PINCH_THIRD_PRESSED:
       three_finger_swipe_has_fired_ = false;
       set_state(GS_THREE_FINGER_SWIPE);
       break;
     case GST_THREE_FINGER_SWIPE_FIRST_RELEASED:
     case GST_THREE_FINGER_SWIPE_SECOND_RELEASED:
     case GST_THREE_FINGER_SWIPE_THIRD_RELEASED:
     case GST_THREE_FINGER_SWIPE_FIRST_CANCELLED:
     case GST_THREE_FINGER_SWIPE_SECOND_CANCELLED:
     case GST_THREE_FINGER_SWIPE_THIRD_CANCELLED:
+      GetPointByPointId(0)->ResetVelocity();
+      GetPointByPointId(1)->ResetVelocity();
+      GetPointByPointId(2)->ResetVelocity();
       set_state(GS_PINCH);
       break;
     case GST_THREE_FINGER_SWIPE_FIRST_MOVED:
     case GST_THREE_FINGER_SWIPE_SECOND_MOVED:
     case GST_THREE_FINGER_SWIPE_THIRD_MOVED:
       if (!three_finger_swipe_has_fired_) {
         ThreeFingerSwipeUpdate(event, point, gestures.get());
         GetPointByPointId(0)->UpdateForScroll();
         GetPointByPointId(1)->UpdateForScroll();
         GetPointByPointId(2)->UpdateForScroll();
@@ skipping 362 matching lines @@
         distance / pinch_distance_current_, gestures);
     pinch_distance_current_ = distance;
   }
   return true;
 }
 
 bool GestureSequence::PinchEnd(const TouchEvent& event,
     const GesturePoint& point, Gestures* gestures) {
   DCHECK(state_ == GS_PINCH);
 
-  const GesturePoint* point1 = GetPointByPointId(0);
-  const GesturePoint* point2 = GetPointByPointId(1);
+  GesturePoint* point1 = GetPointByPointId(0);
+  GesturePoint* point2 = GetPointByPointId(1);
 
   float distance = point1->Distance(*point2);
   AppendPinchGestureEnd(*point1, *point2,
       distance / pinch_distance_start_, gestures);
 
+  point1->ResetVelocity();
+  point2->ResetVelocity();
+
   pinch_distance_start_ = 0;
   pinch_distance_current_ = 0;
   return true;
 }
 
 bool GestureSequence::ThreeFingerSwipeUpdate(const TouchEvent& event,
     const GesturePoint& point, Gestures* gestures) {
   DCHECK(state_ == GS_THREE_FINGER_SWIPE);
 
   GesturePoint* point1 = GetPointByPointId(0);
@@ skipping 41 matching lines @@
         vy3 * sign < min_velocity)
       return false;
     AppendThreeFingerSwipeGestureEvent(*point1, *point2, *point3,
                                        0, sign, gestures);
   }
   three_finger_swipe_has_fired_ = true;
   return true;
 }
 
 }  // namespace ui