Make LayerScrollOffsetDelegate updates consistent.

content/browser/android/in_process/synchronous_compositor_impl.cc

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 89d919eb28228a332f6f10d5cdfbb570fd182cac..c3538632698f6687998fc7b437b914ff65654d80 100644
--- a/content/browser/android/in_process/synchronous_compositor_impl.cc
+++ b/content/browser/android/in_process/synchronous_compositor_impl.cc
@@ -224,13 +224,6 @@ void SynchronousCompositorImpl::DidActivatePendingTree() {
     compositor_client_->DidUpdateContent();
 }
 
-void SynchronousCompositorImpl::SetMaxScrollOffset(
-    const gfx::Vector2dF& max_scroll_offset) {
-  DCHECK(CalledOnValidThread());
-  if (compositor_client_)
-    compositor_client_->SetMaxRootLayerScrollOffset(max_scroll_offset);
-}
-
 void SynchronousCompositorImpl::SetTotalScrollOffset(
     const gfx::Vector2dF& new_value) {
   DCHECK(CalledOnValidThread());
@@ -252,21 +245,23 @@ bool SynchronousCompositorImpl::IsExternalFlingActive() const {
   return false;
 }
 
-void SynchronousCompositorImpl::SetTotalPageScaleFactorAndLimits(
+void SynchronousCompositorImpl::UpdateRootLayerState(
+    const gfx::Vector2dF& total_scroll_offset,
+    const gfx::Vector2dF& max_scroll_offset,
+    const gfx::SizeF& scrollable_size,
     float page_scale_factor,
     float min_page_scale_factor,
     float max_page_scale_factor) {
   DCHECK(CalledOnValidThread());
-  if (compositor_client_)
-    compositor_client_->SetRootLayerPageScaleFactorAndLimits(
-        page_scale_factor, min_page_scale_factor, max_page_scale_factor);
-}
-
-void SynchronousCompositorImpl::SetScrollableSize(
-    const gfx::SizeF& scrollable_size) {
-  DCHECK(CalledOnValidThread());
-  if (compositor_client_)
-    compositor_client_->SetRootLayerScrollableSize(scrollable_size);
+  if (!compositor_client_)
+    return;
+
+  compositor_client_->UpdateRootLayerState(total_scroll_offset,
+                                           max_scroll_offset,
+                                           scrollable_size,
+                                           page_scale_factor,
+                                           min_page_scale_factor,
+                                           max_page_scale_factor);
 }
 
 // Not using base::NonThreadSafe as we want to enforce a more exacting threading