Move MaxScrollOffset to property_trees

cc/trees/property_tree.h

 // 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.
 
 #ifndef CC_TREES_PROPERTY_TREE_H_
 #define CC_TREES_PROPERTY_TREE_H_
 
 #include <stddef.h>
 
 #include <vector>
@@ skipping 252 matching lines @@
 };
 
 typedef TreeNode<EffectNodeData> EffectNode;
 
 struct CC_EXPORT ScrollNodeData {
   ScrollNodeData();
 
   bool scrollable;
   uint32_t main_thread_scrolling_reasons;
   bool contains_non_fast_scrollable_region;
-
-  int transform_id;
+  gfx::Size scroll_clip_layer_bounds;
+  gfx::Size bounds;
+  bool envelope_page_scale_layer_with_clip_layer;

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

This variable could use a comment (or perhaps a clearer name).

+  bool is_inner_viewport_scroll_layer;
+  bool is_outer_viewport_scroll_layer;
+  bool is_inner_viewport_container_layer;
+  bool is_outer_viewport_container_layer;
 
   bool operator==(const ScrollNodeData& other) const;
 
   void ToProtobuf(proto::TreeNode* proto) const;
   void FromProtobuf(const proto::TreeNode& proto);
 };
 
 typedef TreeNode<ScrollNodeData> ScrollNode;
 
+class PropertyTrees;
+
 template <typename T>
 class CC_EXPORT PropertyTree {
  public:
   PropertyTree();
   virtual ~PropertyTree();
 
   bool operator==(const PropertyTree<T>& other) const;
 
   int Insert(const T& tree_node, int parent_id);
 
@@ skipping 23 matching lines @@
   bool needs_update() const { return needs_update_; }
 
   std::vector<T>& nodes() { return nodes_; }
   const std::vector<T>& nodes() const { return nodes_; }
 
   int next_available_id() const { return static_cast<int>(size()); }
 
   void ToProtobuf(proto::PropertyTree* proto) const;
   void FromProtobuf(const proto::PropertyTree& proto);
 
+  void SetPropertyTrees(PropertyTrees* property_trees) {
+    property_trees_ = property_trees;
+  }
+  PropertyTrees* property_trees() const { return property_trees_; }
+
  private:
   // Copy and assign are permitted. This is how we do tree sync.
   std::vector<T> nodes_;
 
   bool needs_update_;
+  PropertyTrees* property_trees_;
 };
 
 class CC_EXPORT TransformTree final : public PropertyTree<TransformNode> {
  public:
   TransformTree();
   ~TransformTree() override;
 
   bool operator==(const TransformTree& other) const;
 
   void clear() override;
@@ skipping 62 matching lines @@
   }
   float device_scale_factor() const { return device_scale_factor_; }
 
   void SetDeviceTransform(const gfx::Transform& transform,
                           gfx::PointF root_position);
   void SetDeviceTransformScaleFactor(const gfx::Transform& transform);
   float device_transform_scale_factor() const {
     return device_transform_scale_factor_;
   }
 
-  void SetInnerViewportBoundsDelta(gfx::Vector2dF bounds_delta);
-  gfx::Vector2dF inner_viewport_bounds_delta() const {
-    return inner_viewport_bounds_delta_;
-  }
+  void UpdateInnerViewportContainerBoundsDelta();
 
-  void SetOuterViewportBoundsDelta(gfx::Vector2dF bounds_delta);
-  gfx::Vector2dF outer_viewport_bounds_delta() const {
-    return outer_viewport_bounds_delta_;
-  }
+  void UpdateOuterViewportContainerBoundsDelta();
 
   void AddNodeAffectedByInnerViewportBoundsDelta(int node_id);
   void AddNodeAffectedByOuterViewportBoundsDelta(int node_id);
 
   bool HasNodesAffectedByInnerViewportBoundsDelta() const;
   bool HasNodesAffectedByOuterViewportBoundsDelta() const;
 
   const std::vector<int>& nodes_affected_by_inner_viewport_bounds_delta()
       const {
     return nodes_affected_by_inner_viewport_bounds_delta_;
@@ skipping 41 matching lines @@
       TransformNode* parent_node);
   bool NeedsSourceToParentUpdate(TransformNode* node);
 
   bool source_to_parent_updates_allowed_;
   // When to_screen transform has perspective, the transform node's sublayer
   // scale is calculated using page scale factor, device scale factor and the
   // scale factor of device transform. So we need to store them explicitly.
   float page_scale_factor_;
   float device_scale_factor_;
   float device_transform_scale_factor_;
-  gfx::Vector2dF inner_viewport_bounds_delta_;
-  gfx::Vector2dF outer_viewport_bounds_delta_;
   std::vector<int> nodes_affected_by_inner_viewport_bounds_delta_;
   std::vector<int> nodes_affected_by_outer_viewport_bounds_delta_;
 };
 
 class CC_EXPORT ClipTree final : public PropertyTree<ClipNode> {
  public:
   bool operator==(const ClipTree& other) const;
 
   void SetViewportClip(gfx::RectF viewport_rect);
   gfx::RectF ViewportClip();
@@ skipping 15 matching lines @@
   void ToProtobuf(proto::PropertyTree* proto) const;
   void FromProtobuf(const proto::PropertyTree& proto);
 
  private:
   void UpdateOpacities(EffectNode* node, EffectNode* parent_node);
   void UpdateIsDrawn(EffectNode* node, EffectNode* parent_node);
 };
 
 class CC_EXPORT ScrollTree final : public PropertyTree<ScrollNode> {
  public:
+  ScrollTree();
+  ~ScrollTree() override;
+
   bool operator==(const ScrollTree& other) const;
 
   void ToProtobuf(proto::PropertyTree* proto) const;
   void FromProtobuf(const proto::PropertyTree& proto);
+
+  gfx::ScrollOffset MaxScrollOffset(int scroll_node_id) const;
 };
 
 class CC_EXPORT PropertyTrees final {
  public:
   PropertyTrees();
   ~PropertyTrees();
 
   bool operator==(const PropertyTrees& other) const;
 
   void ToProtobuf(proto::PropertyTrees* proto) const;
   void FromProtobuf(const proto::PropertyTrees& proto);
 
+  void SetupInternalPointers() {
+    transform_tree.SetPropertyTrees(this);
+    effect_tree.SetPropertyTrees(this);
+    clip_tree.SetPropertyTrees(this);
+    scroll_tree.SetPropertyTrees(this);

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

How about making the constructor and assignment operator take care of this? (so
we don't depend on callers remembering to call this)

+  }
+
   TransformTree transform_tree;
   EffectTree effect_tree;
   ClipTree clip_tree;
   ScrollTree scroll_tree;
   bool needs_rebuild;
   bool non_root_surfaces_enabled;
   int sequence_number;
+
+  void SetInnerViewportContainerBoundsDelta(gfx::Vector2dF bounds_delta);
+  void SetOuterViewportContainerBoundsDelta(gfx::Vector2dF bounds_delta);
+  void SetInnerViewportScrollBoundsDelta(gfx::Vector2dF bounds_delta);
+
+  gfx::Vector2dF inner_viewport_container_bounds_delta() const {
+    return inner_viewport_container_bounds_delta_;
+  }
+
+  gfx::Vector2dF outer_viewport_container_bounds_delta() const {
+    return outer_viewport_container_bounds_delta_;
+  }
+
+  gfx::Vector2dF inner_viewport_scroll_bounds_delta() const {
+    return inner_viewport_scroll_bounds_delta_;
+  }
+
+ private:
+  gfx::Vector2dF inner_viewport_container_bounds_delta_;
+  gfx::Vector2dF outer_viewport_container_bounds_delta_;
+  gfx::Vector2dF inner_viewport_scroll_bounds_delta_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_PROPERTY_TREE_H_