Unify Android Webview and Chrome's fling

content/browser/android/in_process/synchronous_compositor_impl.cc

 // Copyright 2013 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/browser/android/in_process/synchronous_compositor_impl.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 325 matching lines @@
   DCHECK(CalledOnValidThread());
   DCHECK(compositor_client_);
   if (!registered_with_client_)
     return gfx::ScrollOffset();
   // TODO(miletus): Make GetTotalRootLayerScrollOffset return
   // ScrollOffset. crbug.com/414283.
   return gfx::ScrollOffset(
       compositor_client_->GetTotalRootLayerScrollOffset());
 }
 
-bool SynchronousCompositorImpl::IsExternalFlingActive() const {
+bool SynchronousCompositorImpl::IsExternalScrollActive() const {
   DCHECK(CalledOnValidThread());
   DCHECK(compositor_client_);
   if (!registered_with_client_)
     return false;
-  return compositor_client_->IsExternalFlingActive();
+  return compositor_client_->IsExternalScrollActive();
+}
+
+void SynchronousCompositorImpl::SetNeedsAnimate(
+    const AnimationCallback& animation) {
+  DCHECK(CalledOnValidThread());
+  DCHECK(compositor_client_);

[boliu, 2015/06/08 16:54:52]

Should check for registered_with_client_ after rebase

[hush (inactive), 2015/06/09 19:11:34]

Done.

+  compositor_client_->SetNeedsAnimateScroll(animation);
 }
 
 void SynchronousCompositorImpl::UpdateRootLayerState(
     const gfx::ScrollOffset& total_scroll_offset,
     const gfx::ScrollOffset& max_scroll_offset,
     const gfx::SizeF& scrollable_size,
     float page_scale_factor,
     float min_page_scale_factor,
     float max_page_scale_factor) {
   DCHECK(CalledOnValidThread());
@@ skipping 26 matching lines @@
     g_factory.Get();  // Ensure it's initialized.
     SynchronousCompositorImpl::CreateForWebContents(contents);
   }
   SynchronousCompositorImpl* instance =
       SynchronousCompositorImpl::FromWebContents(contents);
   DCHECK(instance);
   instance->SetClient(client);
 }
 
 }  // namespace content