cc: Use sublayer scale from effect tree (2)

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 134 matching lines @@
   // 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,
                         int dest_id,
                         gfx::Transform* transform) const;
 
   // Computes the change of basis transform from node |source_id| to |dest_id|,
   // including any sublayer scale at |dest_id|.  The function returns false iff
   // the inverse of a singular transform was used (and the result should,
   // therefore, not be trusted).
-  bool ComputeTransformWithDestinationSublayerScale(
+  bool ComputeTransformWithDestinationSurfaceContentsScale(
       int source_id,
       int dest_id,
       gfx::Transform* transform) const;
 
-  // Computes the change of basis transform from node |source_id| to |dest_id|,
-  // including any sublayer scale at |source_id|.  The function returns false
-  // iff the inverse of a singular transform was used (and the result should,
-  // therefore, not be trusted).
-  bool ComputeTransformWithSourceSublayerScale(int source_id,
-                                               int dest_id,
-                                               gfx::Transform* transform) const;
-
   // Returns true iff the nodes indexed by |source_id| and |dest_id| are 2D axis
   // aligned with respect to one another.
   bool Are2DAxisAligned(int source_id, int dest_id) const;
 
   void ResetChangeTracking();
   // Updates the parent, target, and screen space transforms and snapping.
   void UpdateTransforms(int id);
   void UpdateTransformChanged(TransformNode* node,
                               TransformNode* parent_node,
                               TransformNode* source_node);
@@ skipping 69 matching lines @@
   int TargetId(int node_id) const;
   void SetTargetId(int node_id, int target_id);
 
   int ContentTargetId(int node_id) const;
   void SetContentTargetId(int node_id, int content_target_id);
 
   const std::vector<TransformCachedNodeData>& cached_data() const {
     return cached_data_;
   }
 
-  gfx::Transform ToScreenSpaceTransformWithoutSublayerScale(int id) const;
+  gfx::Transform ToScreenSpaceTransformWithoutSurfaceContentsScale(
+      int id) const;
 
   void ToProtobuf(proto::PropertyTree* proto) const;
   void FromProtobuf(const proto::PropertyTree& proto,
                     std::unordered_map<int, int>* node_id_to_index_map);
 
  private:
   // Returns true iff the node at |desc_id| is a descendant of the node at
   // |anc_id|.
   bool IsDescendant(int desc_id, int anc_id) const;
 
   // Computes the combined transform between |source_id| and |dest_id| and
   // returns false if the inverse of a singular transform was used. These two
   // nodes must be on the same ancestor chain.
   bool CombineTransformsBetween(int source_id,
                                 int dest_id,
                                 gfx::Transform* transform) const;
 
   // Computes the combined inverse transform between |source_id| and |dest_id|
   // and returns false if the inverse of a singular transform was used. These
   // two nodes must be on the same ancestor chain.
   bool CombineInversesBetween(int source_id,
                               int dest_id,
                               gfx::Transform* transform) const;
 
   void UpdateLocalTransform(TransformNode* node);
   void UpdateScreenSpaceTransform(TransformNode* node,
                                   TransformNode* parent_node,
                                   TransformNode* target_node);
-  void UpdateSublayerScale(TransformNode* node);
+  void UpdateSurfaceContentsScale(TransformNode* node);
   void UpdateTargetSpaceTransform(TransformNode* node,
                                   TransformNode* target_node);
   void UpdateAnimationProperties(TransformNode* node,
                                  TransformNode* parent_node);
   void UndoSnapping(TransformNode* node);
   void UpdateSnapping(TransformNode* node);
   void UpdateNodeAndAncestorsHaveIntegerTranslations(
       TransformNode* node,
       TransformNode* parent_node);
   bool NeedsSourceToParentUpdate(TransformNode* node);
@@ skipping 27 matching lines @@
   EffectTree();
   ~EffectTree();
 
   EffectTree& operator=(const EffectTree& from);
   bool operator==(const EffectTree& other) const;
 
   void clear();
 
   float EffectiveOpacity(const EffectNode* node) const;
 
-  void UpdateSublayerScale(EffectNode* node);
+  void UpdateSurfaceContentsScale(EffectNode* node);
 
   void UpdateEffects(int id);
 
   void UpdateEffectChanged(EffectNode* node, EffectNode* parent_node);
 
   void AddCopyRequest(int node_id, std::unique_ptr<CopyOutputRequest> request);
   void PushCopyRequestsTo(EffectTree* other_tree);
   void TakeCopyRequestsAndTransformToSurface(
       int node_id,
       std::vector<std::unique_ptr<CopyOutputRequest>>* requests);
@@ skipping 223 matching lines @@
   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_