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

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 a todo Created 5 years, 7 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 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(

Powered by Google App Engine
This is Rietveld 408576698