Move MaxScrollOffset to property_trees

cc/trees/property_tree_builder.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/property_tree_builder.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <set>
@@ skipping 23 matching lines @@
   ScrollTree* scroll_tree;
   LayerType* transform_tree_parent;
   LayerType* transform_fixed_parent;
   int render_target;
   int clip_tree_parent;
   int effect_tree_parent;
   int scroll_tree_parent;
   const LayerType* page_scale_layer;
   const LayerType* inner_viewport_scroll_layer;
   const LayerType* outer_viewport_scroll_layer;
+  const LayerType* inner_viewport_container_layer;
+  const LayerType* outer_viewport_container_layer;
   const LayerType* overscroll_elasticity_layer;
   gfx::Vector2dF elastic_overscroll;
   float page_scale_factor;
   bool in_subtree_of_page_scale_layer;
   bool affected_by_inner_viewport_bounds_delta;
   bool affected_by_outer_viewport_bounds_delta;
   bool should_flatten;
   bool target_is_clipped;
   bool is_hidden;
   uint32_t main_thread_scrolling_reasons;
@@ skipping 619 matching lines @@
 
   if (!requires_node) {
     data_for_children->scroll_tree_parent = parent_id;
   } else {
     ScrollNode node;
     node.owner_id = layer->id();
     node.data.scrollable = scrollable;
     node.data.main_thread_scrolling_reasons = main_thread_scrolling_reasons;
     node.data.contains_non_fast_scrollable_region =
         contains_non_fast_scrollable_region;
-    node.data.transform_id =
-        data_for_children->transform_tree_parent->transform_tree_index();
+    gfx::Size clip_bounds;
+    if (layer->scroll_clip_layer()) {
+      clip_bounds = layer->scroll_clip_layer()->bounds();
+      clip_bounds.Enlarge(-layer->scroll_clip_layer()->bounds_delta().x(),
+                          -layer->scroll_clip_layer()->bounds_delta().y());
+      if (layer->scroll_clip_layer()->transform_tree_index() !=
+          kInvalidPropertyTreeNodeId) {
+        node.data.envelope_page_scale_layer_with_clip_layer =
+            !data_from_ancestor.transform_tree
+                 ->Node(layer->scroll_clip_layer()->transform_tree_index())
+                 ->data.in_subtree_of_page_scale_layer &&
+            data_from_ancestor.in_subtree_of_page_scale_layer;
+      }
+    }
+    node.data.scroll_clip_layer_bounds = clip_bounds;
+
+    node.data.is_inner_viewport_scroll_layer =
+        layer == data_from_ancestor.inner_viewport_scroll_layer;
+    node.data.is_outer_viewport_scroll_layer =
+        layer == data_from_ancestor.outer_viewport_scroll_layer;
+    node.data.is_inner_viewport_container_layer =
+        layer == data_from_ancestor.inner_viewport_container_layer;
+    node.data.is_outer_viewport_container_layer =
+        layer == data_from_ancestor.outer_viewport_container_layer;
+
+    node.data.bounds = layer->bounds();
+    node.data.bounds.Enlarge(-layer->bounds_delta().x(),
+                             -layer->bounds_delta().y());

[ajuma, 2016/02/09 16:27:13]

Since bounds_delta is always 0 on Layer, the only reason to take bounds_delta
into account is for tests. But what if we ignore them here, and instead just
make sure that the bounds_delta values we store elsewhere are up to date?

+
     data_for_children->scroll_tree_parent =
         data_for_children->scroll_tree->Insert(node, parent_id);
     data_for_children->main_thread_scrolling_reasons =
         node.data.main_thread_scrolling_reasons;
     data_for_children->scroll_tree_parent_created_by_uninheritable_criteria =
         scroll_node_uninheritable_criteria;
   }
 
   layer->SetScrollTreeIndex(data_for_children->scroll_tree_parent);
 }
@@ skipping 146 matching lines @@
   data_for_recursion.scroll_tree = &property_trees->scroll_tree;
   data_for_recursion.transform_tree_parent = nullptr;
   data_for_recursion.transform_fixed_parent = nullptr;
   data_for_recursion.render_target = kRootPropertyTreeNodeId;
   data_for_recursion.clip_tree_parent = kRootPropertyTreeNodeId;
   data_for_recursion.effect_tree_parent = kInvalidPropertyTreeNodeId;
   data_for_recursion.scroll_tree_parent = kRootPropertyTreeNodeId;
   data_for_recursion.page_scale_layer = page_scale_layer;
   data_for_recursion.inner_viewport_scroll_layer = inner_viewport_scroll_layer;
   data_for_recursion.outer_viewport_scroll_layer = outer_viewport_scroll_layer;
+  data_for_recursion.inner_viewport_container_layer =
+      inner_viewport_scroll_layer
+          ? inner_viewport_scroll_layer->scroll_clip_layer()
+          : nullptr;
+  data_for_recursion.outer_viewport_container_layer =
+      outer_viewport_scroll_layer
+          ? outer_viewport_scroll_layer->scroll_clip_layer()
+          : nullptr;
   data_for_recursion.overscroll_elasticity_layer = overscroll_elasticity_layer;
   data_for_recursion.elastic_overscroll = elastic_overscroll;
   data_for_recursion.page_scale_factor = page_scale_factor;
   data_for_recursion.in_subtree_of_page_scale_layer = false;
   data_for_recursion.affected_by_inner_viewport_bounds_delta = false;
   data_for_recursion.affected_by_outer_viewport_bounds_delta = false;
   data_for_recursion.should_flatten = false;
   data_for_recursion.target_is_clipped = false;
   data_for_recursion.is_hidden = false;
   data_for_recursion.main_thread_scrolling_reasons =
@@ skipping 65 matching lines @@
     const gfx::Transform& device_transform,
     PropertyTrees* property_trees) {
   BuildPropertyTreesTopLevelInternal(
       root_layer, page_scale_layer, inner_viewport_scroll_layer,
       outer_viewport_scroll_layer, overscroll_elasticity_layer,
       elastic_overscroll, page_scale_factor, device_scale_factor, viewport,
       device_transform, property_trees);
 }
 
 }  // namespace cc