| 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 24232ae06d29966daaaaa418446748cc03b3865d..7e5ec23e0136b28487c0b95e715e48c63d0a0353 100644
|
| --- a/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| +++ b/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| @@ -327,10 +327,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_)
|
| + compositor_client_->SetNeedsAnimateScroll(animation);
|
| }
|
|
|
| void SynchronousCompositorImpl::UpdateRootLayerState(
|
|
|