[CRD iOS] Fix bugs in FlingTracker

remoting/client/ui/gesture_interpreter.cc

 // Copyright 2017 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 "remoting/client/ui/gesture_interpreter.h"
 
 #include "base/bind.h"
 #include "base/time/time.h"
 #include "remoting/client/chromoting_session.h"
 #include "remoting/client/ui/direct_input_strategy.h"
 #include "remoting/client/ui/renderer_proxy.h"
 #include "remoting/client/ui/trackpad_input_strategy.h"
 
 namespace {
 
 const float kOneFingerFlingTimeConstant = 325.f;
-const float kScrollFlingTimeConstant = 120.f;
+const float kScrollFlingTimeConstant = 250.f;
 
 }  // namespace
 
 namespace remoting {
 GestureInterpreter::GestureInterpreter(RendererProxy* renderer,
                                        ChromotingSession* input_stub)
     : renderer_(renderer),
       input_stub_(input_stub),
       pan_animation_(kOneFingerFlingTimeConstant,
                      base::Bind(&GestureInterpreter::PanWithoutAbortAnimations,
@@ skipping 101 matching lines @@
 void GestureInterpreter::ScrollWithVelocity(float velocity_x,
                                             float velocity_y) {
   AbortAnimations();
 
   scroll_animation_.SetVelocity(velocity_x, velocity_y);
   scroll_animation_.Tick();
 }
 
 void GestureInterpreter::ProcessAnimations() {
   pan_animation_.Tick();
+
+  // TODO(yuweih): It's probably not right to handle host side virtual scroll
+  // momentum in the renderer's callback.
   scroll_animation_.Tick();
 }
 
 void GestureInterpreter::OnSurfaceSizeChanged(int width, int height) {
   viewport_.SetSurfaceSize(width, height);
 }
 
 void GestureInterpreter::OnDesktopSizeChanged(int width, int height) {
   viewport_.SetDesktopSize(width, height);
 }
@@ skipping 18 matching lines @@
 }
 
 void GestureInterpreter::ScrollWithoutAbortAnimations(float dx, float dy) {
   ViewMatrix::Point desktopDelta =
       input_strategy_->MapScreenVectorToDesktop({dx, dy}, viewport_);
   input_stub_->SendMouseWheelEvent(desktopDelta.x, desktopDelta.y);
 }
 
 void GestureInterpreter::AbortAnimations() {
   pan_animation_.Abort();
+  scroll_animation_.Abort();
 }
 
 void GestureInterpreter::InjectMouseClick(
     float x,
     float y,
     protocol::MouseEvent_MouseButton button) {
   input_stub_->SendMouseEvent(x, y, button, true);
   input_stub_->SendMouseEvent(x, y, button, false);
 }
 
@@ skipping 22 matching lines @@
   if (feedback_radius > 0) {
     // TODO(yuweih): The renderer takes diameter as parameter. Consider moving
     // the *2 logic inside the renderer.
     float diameter_on_desktop =
         2.f * feedback_radius / viewport_.GetTransformation().GetScale();
     renderer_->StartInputFeedback(cursor_x, cursor_y, diameter_on_desktop);
   }
 }
 
 }  // namespace remoting