Chromium Code Reviews| 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..49b127dd61006d537fc7d6abf747e35d5579719c 100644 |
| --- a/content/browser/android/in_process/synchronous_compositor_impl.cc |
| +++ b/content/browser/android/in_process/synchronous_compositor_impl.cc |
| @@ -343,12 +343,19 @@ 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_); |
|
boliu
2015/06/08 16:54:52
Should check for registered_with_client_ after reb
hush (inactive)
2015/06/09 19:11:34
Done.
|
| + compositor_client_->SetNeedsAnimateScroll(animation); |
| } |
| void SynchronousCompositorImpl::UpdateRootLayerState( |