Unify Android Webview and Chrome's fling

android_webview/browser/test/rendering_test.h

 // 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.
 
 #ifndef ANDROID_WEBVIEW_BROWSER_TEST_RENDERING_TEST_H_
 #define ANDROID_WEBVIEW_BROWSER_TEST_RENDERING_TEST_H_
 
 #include "android_webview/browser/browser_view_renderer_client.h"
 #include "android_webview/browser/test/fake_window.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 18 matching lines @@
                       public BrowserViewRendererClient,
                       public WindowHooks {
  public:
   // BrowserViewRendererClient overrides.
   bool RequestDrawGL(bool wait_for_completion) override;
   void OnNewPicture() override;
   void PostInvalidate() override;
   void DetachFunctorFromView() override;
   gfx::Point GetLocationOnScreen() override;
   void ScrollContainerViewTo(gfx::Vector2d new_value) override {}
-  bool IsFlingActive() const override;
+  bool IsSmoothScrollingActive() const override;
   void UpdateScrollState(gfx::Vector2d max_scroll_offset,
                          gfx::SizeF contents_size_dip,
                          float page_scale_factor,
                          float min_page_scale_factor,
                          float max_page_scale_factor) override {}
-  void DidOverscroll(gfx::Vector2d overscroll_delta) override {}
+  void DidOverscroll(gfx::Vector2d overscroll_delta,
+                     gfx::Vector2dF overscroll_velocity) override {}
   void ParentDrawConstraintsUpdated(
       const ParentCompositorDrawConstraints& draw_constraints) override {}
   // WindowHooks overrides.
   void WillOnDraw() override {}
   void DidOnDraw(bool success) override {}
   void WillSyncOnRT(SharedRendererState* functor) override {}
   void DidSyncOnRT(SharedRendererState* functor) override {}
   void WillProcessOnRT(SharedRendererState* functor) override {}
   void DidProcessOnRT(SharedRendererState* functor) override {}
   bool WillDrawOnRT(SharedRendererState* functor,
@@ skipping 25 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(RenderingTest);
 };
 
 #define RENDERING_TEST_F(TEST_FIXTURE_NAME)         \
   TEST_F(TEST_FIXTURE_NAME, RunTest) { RunTest(); } \
   class NeedsSemicolon##TEST_FIXTURE_NAME {}
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_TEST_RENDERING_TEST_H_