cc: Compute animation scale on demand

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 <memory>
@@ skipping 137 matching lines @@
   // space transform. For layers in the subtree of the page scale layer, the
   // layer scale factor should include the page scale factor.
   bool in_subtree_of_page_scale_layer : 1;
 
   // We need to track changes to to_screen transform to compute the damage rect.
   bool transform_changed : 1;
 
   // TODO(vollick): will be moved when accelerated effects are implemented.
   float post_local_scale_factor;
 
-  // The maximum scale that that node's |local| transform will have during

[jaydasika, 2016/06/28 23:08:40]

Can we retain the comments ? (move them inside AnimationScaleData, maybe)

[sunxd, 2016/06/30 15:29:44]

Done.

-  // current animations, considering only scales at keyframes not including the
-  // starting keyframe of each animation.
-  float local_maximum_animation_target_scale;
-
-  // The maximum scale that this node's |local| transform will have during
-  // current animatons, considering only the starting scale of each animation.
-  float local_starting_animation_scale;
-
-  // The maximum scale that this node's |to_target| transform will have during
-  // current animations, considering only scales at keyframes not incuding the
-  // starting keyframe of each animation.
-  float combined_maximum_animation_target_scale;
-
-  // The maximum scale that this node's |to_target| transform will have during
-  // current animations, considering only the starting scale of each animation.
-  float combined_starting_animation_scale;
-
   gfx::Vector2dF sublayer_scale;
 
   // TODO(vollick): will be moved when accelerated effects are implemented.
   gfx::ScrollOffset scroll_offset;
 
   // We scroll snap where possible, but this means fixed-pos elements must be
   // adjusted.  This value stores the snapped amount for this purpose.
   gfx::Vector2dF scroll_snap;
 
   // TODO(vollick): will be moved when accelerated effects are implemented.
@@ skipping 11 matching lines @@
 
   void update_post_local_transform(const gfx::PointF& position,
                                    const gfx::Point3F& transform_origin);
 
   void ToProtobuf(proto::TreeNode* proto) const;
   void FromProtobuf(const proto::TreeNode& proto);
 
   void AsValueInto(base::trace_event::TracedValue* value) const;
 };
 
+// TODO(sunxd): move this into PropertyTrees::cached_data_
 struct CC_EXPORT TransformCachedNodeData {
   TransformCachedNodeData();
   TransformCachedNodeData(const TransformCachedNodeData& other);
   ~TransformCachedNodeData();
 
   gfx::Transform from_target;
   gfx::Transform to_target;
   gfx::Transform from_screen;
   gfx::Transform to_screen;
   int target_id;
@@ skipping 201 matching lines @@
  public:
   TransformTree();
   ~TransformTree();
 
   bool operator==(const TransformTree& other) const;
 
   int Insert(const TransformNode& tree_node, int parent_id);
 
   void clear();
 
+  void set_needs_update(bool needs_update);
+
   // Computes the change of basis transform from node |source_id| to |dest_id|.
   // The function returns false iff the inverse of a singular transform was
   // used (and the result should, therefore, not be trusted). Transforms may
   // be computed between any pair of nodes that have an ancestor/descendant
   // relationship. Transforms between other pairs of nodes may only be computed
   // if the following condition holds: let id1 the larger id and let id2 be the
   // other id; then the nearest ancestor of node id1 whose id is smaller than
   // id2 is the lowest common ancestor of the pair of nodes, and the transform
   // from this lowest common ancestor to node id2 is only a 2d translation.
   bool ComputeTransform(int source_id,
@@ skipping 281 matching lines @@
   ScrollOffsetMap layer_id_to_scroll_offset_map_;
 
   SyncedScrollOffset* synced_scroll_offset(int layer_id);
   const SyncedScrollOffset* synced_scroll_offset(int layer_id) const;
   gfx::ScrollOffset PullDeltaForMainThread(SyncedScrollOffset* scroll_offset);
   void UpdateScrollOffsetMapEntry(int key,
                                   ScrollOffsetMap* new_scroll_offset_map,
                                   LayerTreeImpl* layer_tree_impl);
 };
 
+struct AnimationScaleData {
+  int update_number;
+  float local_maximum_animation_target_scale;
+  float local_starting_animation_scale;
+  float combined_maximum_animation_target_scale;
+  float combined_starting_animation_scale;
+
+  AnimationScaleData() {
+    update_number = -1;
+    local_maximum_animation_target_scale = 0.f;
+    local_starting_animation_scale = 0.f;
+    combined_maximum_animation_target_scale = 0.f;
+    combined_starting_animation_scale = 0.f;
+  }
+};
+
+struct CombinedAnimationScale {
+  float maximum_animation_scale;
+  float starting_animation_scale;
+
+  CombinedAnimationScale(float maximum, float starting)
+      : maximum_animation_scale(maximum), starting_animation_scale(starting) {}
+};
+
+struct PropertyTreesCachedData {
+  int property_tree_update_number;
+  std::vector<AnimationScaleData> animation_scales;
+
+  PropertyTreesCachedData();
+  ~PropertyTreesCachedData();
+};
+
 class CC_EXPORT PropertyTrees final {
  public:
   PropertyTrees();
   PropertyTrees(const PropertyTrees& other) = delete;
   ~PropertyTrees();
 
   bool operator==(const PropertyTrees& other) const;
   PropertyTrees& operator=(const PropertyTrees& from);
 
   void ToProtobuf(proto::PropertyTrees* proto) const;
@@ skipping 19 matching lines @@
   bool changed;
   // We cache a global bool for full tree damages to avoid walking the entire
   // tree.
   // TODO(jaydasika): Changes to transform and effects that damage the entire
   // tree should be tracked by this bool. Currently, they are tracked by the
   // individual nodes.
   bool full_tree_damaged;
   int sequence_number;
   bool is_main_thread;
   bool is_active;
+  int property_tree_update_number;

[jaydasika, 2016/06/28 23:08:40]

This is unused.

[sunxd, 2016/06/30 15:29:44]

Done.

 
   void SetInnerViewportContainerBoundsDelta(gfx::Vector2dF bounds_delta);
   void SetOuterViewportContainerBoundsDelta(gfx::Vector2dF bounds_delta);
   void SetInnerViewportScrollBoundsDelta(gfx::Vector2dF bounds_delta);
   void PushOpacityIfNeeded(PropertyTrees* target_tree);
   void RemoveIdFromIdToIndexMaps(int id);
   bool IsInIdToIndexMap(TreeType tree_type, int id);
   void UpdateChangeTracking();
   void PushChangeTrackingTo(PropertyTrees* tree);
   void ResetAllChangeTracking();
 
   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_;
   }
 
   std::unique_ptr<base::trace_event::TracedValue> AsTracedValue() const;
 
+  CombinedAnimationScale GetAnimationScales(int transform_node_id,
+                                            LayerTreeImpl* layer_tree_impl);
+  void SetAnimationScalesForTesting(int transform_id,
+                                    float maximum_animation_scale,
+                                    float starting_animation_scale);
+  void ResetCachedData();
+  void UpdateCachedNumber();
+
  private:
   gfx::Vector2dF inner_viewport_container_bounds_delta_;
   gfx::Vector2dF outer_viewport_container_bounds_delta_;
   gfx::Vector2dF inner_viewport_scroll_bounds_delta_;
+
+  PropertyTreesCachedData cached_data_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_PROPERTY_TREE_H_