Index: content/browser/android/in_process/synchronous_compositor_impl.cc |
diff --git a/content/browser/android/in_process/synchronous_compositor_impl.cc b/content/browser/android/in_process/synchronous_compositor_impl.cc |
index d3c6b830b7082bf6e2dec32f803b6751d249aa47..2583de409741b908b24a8fc4fb8e18824ceabb42 100644 |
--- a/content/browser/android/in_process/synchronous_compositor_impl.cc |
+++ b/content/browser/android/in_process/synchronous_compositor_impl.cc |
@@ -328,10 +328,17 @@ gfx::ScrollOffset SynchronousCompositorImpl::GetTotalScrollOffset() { |
compositor_client_->GetTotalRootLayerScrollOffset()); |
} |
-bool SynchronousCompositorImpl::IsExternalFlingActive() const { |
+bool SynchronousCompositorImpl::IsExternalScrollActive() const { |
DCHECK(CalledOnValidThread()); |
DCHECK(compositor_client_); |
- return compositor_client_->IsExternalFlingActive(); |
+ return compositor_client_->IsExternalScrollActive(); |
+} |
+ |
+void SynchronousCompositorImpl::SetNeedsAnimate( |
+ const AnimationCallback& animation) { |
+ DCHECK(CalledOnValidThread()); |
+ if (compositor_client_) |
boliu
2015/05/29 19:42:47
This is a call from cc, right? In that case, DCHEC
hush (inactive)
2015/06/05 21:47:22
Yes. This is a new function added to LayerScrollOf
|
+ compositor_client_->SetNeedsAnimateScroll(animation); |
} |
void SynchronousCompositorImpl::UpdateRootLayerState( |