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

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: comments 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 f8701c1a00af71945d2af9cb96164ffda94dc0ef..9c0f95796249270706b86974f94d526ddedbf1d1 100644
--- a/content/browser/android/in_process/synchronous_compositor_impl.cc
+++ b/content/browser/android/in_process/synchronous_compositor_impl.cc
@@ -325,13 +325,20 @@ gfx::ScrollOffset SynchronousCompositorImpl::GetTotalScrollOffset() {
return gfx::ScrollOffset();
}
-bool SynchronousCompositorImpl::IsExternalFlingActive() const {
+bool SynchronousCompositorImpl::IsExternalScrollActive() const {
DCHECK(CalledOnValidThread());
if (compositor_client_)
- return compositor_client_->IsExternalFlingActive();
+ return compositor_client_->IsExternalScrollActive();
return false;
}
+void SynchronousCompositorImpl::SetNeedsAnimate(
+ const AnimationCallback& animation) {
+ DCHECK(CalledOnValidThread());
+ if (compositor_client_)
+ compositor_client_->SetNeedsAnimateFling(animation);
+}
+
void SynchronousCompositorImpl::UpdateRootLayerState(
const gfx::ScrollOffset& total_scroll_offset,
const gfx::ScrollOffset& max_scroll_offset,

Powered by Google App Engine
This is Rietveld 408576698