| 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 5963ac59523e0ce806f1dd4df017b6745a73a212..51f5d08c950d09cc22ad3d04d0350d8758ba0da8 100644
|
| --- a/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| +++ b/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| @@ -343,12 +343,21 @@ gfx::ScrollOffset SynchronousCompositorImpl::GetTotalScrollOffset() {
|
| 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_);
|
| + if (!registered_with_client_)
|
| + return;
|
| + compositor_client_->SetNeedsAnimateScroll(animation);
|
| }
|
|
|
| void SynchronousCompositorImpl::UpdateRootLayerState(
|
|
|