cc : Use sublayer scale from effect tree (4)

cc/trees/property_tree.h

Index: cc/trees/property_tree.h
diff --git a/cc/trees/property_tree.h b/cc/trees/property_tree.h
index e9f3bb08b536210982e06cdf539f54378cab5b54..dbc9b4d5aaf54643c9524c39f1abc7a0787fd37e 100644
--- a/cc/trees/property_tree.h
+++ b/cc/trees/property_tree.h
@@ -148,15 +148,6 @@ class CC_EXPORT TransformTree final : public PropertyTree<TransformNode> {
                         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 ComputeTransformWithDestinationSurfaceContentsScale(
-      int source_id,
-      int dest_id,
-      gfx::Transform* transform) const;
-
   void ResetChangeTracking();
   // Updates the parent, target, and screen space transforms and snapping.
   void UpdateTransforms(int id);
@@ -242,9 +233,6 @@ class CC_EXPORT TransformTree final : public PropertyTree<TransformNode> {
     return cached_data_;
   }
 
-  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);
@@ -553,6 +541,9 @@ class CC_EXPORT PropertyTrees final {
                                     float starting_animation_scale);
   void ResetCachedData();
   void UpdateCachedNumber();
+  gfx::Transform ToScreenSpaceTransformWithoutSurfaceContentsScale(
+      int transform_id,
+      int effect_id) const;
 
  private:
   gfx::Vector2dF inner_viewport_container_bounds_delta_;