Revert of Early terminate flings when scrolling impossible

content/child/fling_animator_impl_android.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 "content/child/fling_animator_impl_android.h"
 
 #include "base/logging.h"
 #include "third_party/WebKit/public/platform/WebFloatSize.h"
 #include "third_party/WebKit/public/platform/WebGestureCurveTarget.h"
 #include "ui/gfx/android/view_configuration.h"
@@ skipping 54 matching lines @@
                               blink::WebGestureCurveTarget* target) {
   // Historically, Android's Scroller used |currentAnimationTimeMillis()|,
   // which is equivalent to gfx::FrameTime::Now().  In practice, this produces
   // smoother results than using |time|, so continue using FrameTime::Now().
   // TODO(jdduke): Use |time| upon resolution of crbug.com/345459.
   if (!scroller_.ComputeScrollOffset(gfx::FrameTime::Now())) {
     is_active_ = false;
     return false;
   }
 
+  target->notifyCurrentFlingVelocity(blink::WebFloatSize(
+      scroller_.GetCurrVelocityX(), scroller_.GetCurrVelocityY()));
+
   gfx::PointF current_position(scroller_.GetCurrX(), scroller_.GetCurrY());
   gfx::Vector2dF scroll_amount(current_position - last_position_);
   last_position_ = current_position;
 
   // scrollBy() could delete this curve if the animation is over, so don't touch
   // any member variables after making that call.
-  return target->scrollBy(blink::WebFloatSize(scroll_amount),
-                          blink::WebFloatSize(scroller_.GetCurrVelocityX(),
-                                              scroller_.GetCurrVelocityY()));
+  target->scrollBy(blink::WebFloatSize(scroll_amount));
+  return true;
 }
 
 FlingAnimatorImpl* FlingAnimatorImpl::CreateAndroidGestureCurve(
     const blink::WebFloatPoint& velocity,
     const blink::WebSize&) {
   FlingAnimatorImpl* gesture_curve = new FlingAnimatorImpl();
   gesture_curve->StartFling(velocity);
   return gesture_curve;
 }
 
 }  // namespace content