Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(221)

Unified Diff: content/browser/android/in_process/synchronous_compositor_impl.cc

Issue 1063853005: Unify Android Webview and Chrome's fling (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: add proguard Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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(

Powered by Google App Engine
This is Rietveld 408576698