Move MaxScrollOffset to property_trees

cc/trees/layer_tree_impl.cc

Index: cc/trees/layer_tree_impl.cc
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index 46561da920d67ada5df4ccbb8314cf19304699e9..d41711c0c202617645d969890b01b8fb0f71e119 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -292,6 +292,7 @@ void LayerTreeImpl::UpdatePropertyTreesForBoundsDelta() {
   DCHECK(IsActiveTree());
   LayerImpl* inner_container = InnerViewportContainerLayer();
   LayerImpl* outer_container = OuterViewportContainerLayer();
+  LayerImpl* inner_scroll = InnerViewportScrollLayer();
 
   UpdateClipTreeForBoundsDeltaOnLayer(inner_container,
                                       &property_trees_.clip_tree);
@@ -300,11 +301,15 @@ void LayerTreeImpl::UpdatePropertyTreesForBoundsDelta() {
   UpdateClipTreeForBoundsDeltaOnLayer(outer_container,
                                       &property_trees_.clip_tree);
 
-  TransformTree& transform_tree = property_trees_.transform_tree;
   if (inner_container)
-    transform_tree.SetInnerViewportBoundsDelta(inner_container->bounds_delta());
+    property_trees_.SetInnerViewportContainerBoundsDelta(
+        inner_container->bounds_delta());
   if (outer_container)
-    transform_tree.SetOuterViewportBoundsDelta(outer_container->bounds_delta());
+    property_trees_.SetOuterViewportContainerBoundsDelta(
+        outer_container->bounds_delta());
+  if (inner_scroll)
+    property_trees_.SetInnerViewportScrollBoundsDelta(
+        inner_scroll->bounds_delta());
 }
 
 void LayerTreeImpl::PushPropertiesTo(LayerTreeImpl* target_tree) {
@@ -487,8 +492,13 @@ void LayerTreeImpl::UpdatePropertyTreeScrollingAndAnimationFromMainThread() {
 void LayerTreeImpl::SetPageScaleOnActiveTree(float active_page_scale) {
   DCHECK(IsActiveTree());
   if (page_scale_factor()->SetCurrent(
-          ClampPageScaleFactorToLimits(active_page_scale)))
+          ClampPageScaleFactorToLimits(active_page_scale))) {
+    if (PageScaleLayer() && !property_trees()->needs_rebuild)

[ajuma, 2016/02/10 19:08:13]

We shouldn't be rebuilding on the compositor thread outside of test code, so the
check for needs_rebuild here can be removed.

+      UpdatePageScaleFactorInPropertyTrees(
+          property_trees(), PageScaleLayer(), current_page_scale_factor(),
+          device_scale_factor(), layer_tree_host_impl_->DrawTransform());
     DidUpdatePageScale();
+  }
 }
 
 void LayerTreeImpl::PushPageScaleFromMainThread(float page_scale_factor,
@@ -503,6 +513,10 @@ void LayerTreeImpl::PushPageScaleFactorAndLimits(const float* page_scale_factor,
                                                  float max_page_scale_factor) {
   DCHECK(page_scale_factor || IsActiveTree());
   bool changed_page_scale = false;
+
+  changed_page_scale |=
+      SetPageScaleFactorLimits(min_page_scale_factor, max_page_scale_factor);
+
   if (page_scale_factor) {
     DCHECK(!IsActiveTree() || !layer_tree_host_impl_->pending_tree());
     changed_page_scale |= page_scale_factor_->Delta() != 1.f;
@@ -512,6 +526,7 @@ void LayerTreeImpl::PushPageScaleFactorAndLimits(const float* page_scale_factor,
     changed_page_scale |=
         page_scale_factor_->PushFromMainThread(*page_scale_factor);
   }
+
   if (IsActiveTree()) {
     // TODO(enne): Pushing from pending to active should never require
     // DidUpdatePageScale.  The values should already be set by the fully
@@ -520,8 +535,15 @@ void LayerTreeImpl::PushPageScaleFactorAndLimits(const float* page_scale_factor,
     changed_page_scale |= page_scale_factor_->PushPendingToActive();
   }
 
-  changed_page_scale |=
-      SetPageScaleFactorLimits(min_page_scale_factor, max_page_scale_factor);
+  if (page_scale_factor && !property_trees()->needs_rebuild) {

[ajuma, 2016/02/10 19:08:14]

Here too, we shouldn't be checking for needs_rebuild.

+    if (PageScaleLayer()) {
+      UpdatePageScaleFactorInPropertyTrees(
+          property_trees(), PageScaleLayer(), current_page_scale_factor(),
+          device_scale_factor(), layer_tree_host_impl_->DrawTransform());
+    } else {
+      DCHECK_EQ(*page_scale_factor, 1);
+    }
+  }

[ajuma, 2016/02/10 19:08:14]

This block needs to happen after the next one (since clamping happens in
DidUpdatePageScale).

 
   if (changed_page_scale)
     DidUpdatePageScale();