cc: Clean up transform tree

cc/trees/property_tree_unittest.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.h"
 
 #include "cc/input/main_thread_scrolling_reason.h"
 #include "cc/proto/property_tree.pb.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/trees/clip_node.h"
@@ skipping 19 matching lines @@
   original.needs_local_transform_update = false;
   original.is_invertible = false;
   original.ancestors_are_invertible = false;
   original.has_potential_animation = false;
   original.to_screen_is_potentially_animated = false;
   original.has_only_translation_animations = false;
   original.flattens_inherited_transform = false;
   original.node_and_ancestors_are_flat = false;
   original.node_and_ancestors_have_only_integer_translation = false;
   original.scrolls = false;
-  original.needs_surface_contents_scale = false;
   original.affected_by_inner_viewport_bounds_delta_x = false;
   original.affected_by_inner_viewport_bounds_delta_y = false;
   original.affected_by_outer_viewport_bounds_delta_x = false;
   original.affected_by_outer_viewport_bounds_delta_y = false;
   original.in_subtree_of_page_scale_layer = false;
   original.post_local_scale_factor = 0.5f;
-  original.surface_contents_scale = gfx::Vector2dF(0.5f, 0.5f);
   original.scroll_offset = gfx::ScrollOffset(1.5f, 1.5f);
   original.scroll_snap = gfx::Vector2dF(0.4f, 0.4f);
   original.source_offset = gfx::Vector2dF(2.5f, 2.4f);
   original.source_to_parent = gfx::Vector2dF(3.2f, 3.2f);
 
   proto::TreeNode proto;
   original.ToProtobuf(&proto);
   TransformNode result;
   result.FromProtobuf(proto);
 
@@ skipping 334 matching lines @@
     TransformTree& tree = property_trees.transform_tree;
     TransformNode& root = *tree.Node(0);
     root.id = 0;
     root.local.Translate(2, 2);
     tree.SetTargetId(root.id, 0);
     SetupTransformTreeForTest(&tree);
     tree.UpdateTransforms(0);
 
     gfx::Transform expected;
     gfx::Transform transform;
-    bool success = tree.ComputeTransform(0, 0, &transform);
+    bool success = tree.ComputeTransformForTesting(0, 0, &transform);
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
 
     transform.MakeIdentity();
     expected.Translate(2, 2);
-    success = tree.ComputeTransform(0, -1, &transform);
+    success = tree.ComputeTransformForTesting(0, -1, &transform);
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
 
     transform.MakeIdentity();
     expected.MakeIdentity();
     expected.Translate(-2, -2);
-    success = tree.ComputeTransform(-1, 0, &transform);
+    success = tree.ComputeTransformForTesting(-1, 0, &transform);
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
   }
 };
 
 DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F(
     PropertyTreeTestComputeTransformRoot);
 
 class PropertyTreeTestComputeTransformChild : public PropertyTreeTest {
  protected:
@@ skipping 11 matching lines @@
     child.id = tree.Insert(child, 0);
     tree.SetTargetId(child.id, 0);
 
     SetupTransformTreeForTest(&tree);
     tree.UpdateTransforms(1);
 
     gfx::Transform expected;
     gfx::Transform transform;
 
     expected.Translate(3, 3);
-    bool success = tree.ComputeTransform(1, 0, &transform);
+    bool success = tree.ComputeTransformForTesting(1, 0, &transform);
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
 
     transform.MakeIdentity();
     expected.MakeIdentity();
     expected.Translate(-3, -3);
-    success = tree.ComputeTransform(0, 1, &transform);
+    success = tree.ComputeTransformForTesting(0, 1, &transform);
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
 
     transform.MakeIdentity();
     expected.MakeIdentity();
     expected.Translate(5, 5);
-    success = tree.ComputeTransform(1, -1, &transform);
+    success = tree.ComputeTransformForTesting(1, -1, &transform);
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
 
     transform.MakeIdentity();
     expected.MakeIdentity();
     expected.Translate(-5, -5);
-    success = tree.ComputeTransform(-1, 1, &transform);
+    success = tree.ComputeTransformForTesting(-1, 1, &transform);
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
   }
 };
 
 DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F(
     PropertyTreeTestComputeTransformChild);
 
 class PropertyTreeTestComputeTransformSibling : public PropertyTreeTest {
  protected:
@@ skipping 19 matching lines @@
 
     SetupTransformTreeForTest(&tree);
 
     tree.UpdateTransforms(1);
     tree.UpdateTransforms(2);
 
     gfx::Transform expected;
     gfx::Transform transform;
 
     expected.Translate(4, 4);
-    bool success = tree.ComputeTransform(2, 1, &transform);
+    bool success = tree.ComputeTransformForTesting(2, 1, &transform);
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
 
     transform.MakeIdentity();
     expected.MakeIdentity();
     expected.Translate(-4, -4);
-    success = tree.ComputeTransform(1, 2, &transform);
+    success = tree.ComputeTransformForTesting(1, 2, &transform);
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
   }
 };
 
 DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F(
     PropertyTreeTestComputeTransformSibling);
 
 class PropertyTreeTestComputeTransformSiblingSingularAncestor
     : public PropertyTreeTest {
@@ skipping 36 matching lines @@
     SetupTransformTreeForTest(&tree);
 
     tree.UpdateTransforms(1);
     tree.UpdateTransforms(2);
     tree.UpdateTransforms(3);
 
     gfx::Transform expected;
     gfx::Transform transform;
 
     expected.Translate(4, 4);
-    bool success = tree.ComputeTransform(3, 2, &transform);
+    bool success = tree.ComputeTransformForTesting(3, 2, &transform);
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
 
     transform.MakeIdentity();
     expected.MakeIdentity();
     expected.Translate(-4, -4);
-    success = tree.ComputeTransform(2, 3, &transform);
+    success = tree.ComputeTransformForTesting(2, 3, &transform);
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
   }
 };
 
 DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F(
     PropertyTreeTestComputeTransformSiblingSingularAncestor);
 
 class PropertyTreeTestTransformsWithFlattening : public PropertyTreeTest {
  protected:
@@ skipping 14 matching lines @@
 
     gfx::Transform rotation_about_x;
     rotation_about_x.RotateAboutXAxis(15);
 
     int parent = tree.Insert(TransformNode(), grand_parent);
     int effect_parent = effect_tree.Insert(EffectNode(), effect_grand_parent);
     effect_tree.Node(effect_parent)->transform_id = parent;
     effect_tree.Node(effect_parent)->has_render_surface = true;
     effect_tree.Node(effect_parent)->surface_contents_scale =
         gfx::Vector2dF(1.f, 1.f);
-    tree.Node(parent)->needs_surface_contents_scale = true;
     tree.SetTargetId(parent, grand_parent);
     tree.SetContentTargetId(parent, parent);
     tree.Node(parent)->source_node_id = grand_parent;
     tree.Node(parent)->local = rotation_about_x;
 
     int child = tree.Insert(TransformNode(), parent);
     tree.SetTargetId(child, parent);
     tree.SetContentTargetId(child, parent);
     tree.Node(child)->source_node_id = parent;
     tree.Node(child)->flattens_inherited_transform = true;
     tree.Node(child)->local = rotation_about_x;
 
     int grand_child = tree.Insert(TransformNode(), child);
     tree.SetTargetId(grand_child, parent);
     tree.SetContentTargetId(grand_child, parent);
     tree.Node(grand_child)->source_node_id = child;
     tree.Node(grand_child)->flattens_inherited_transform = true;
     tree.Node(grand_child)->local = rotation_about_x;
 
     tree.set_needs_update(true);
     SetupTransformTreeForTest(&tree);
     draw_property_utils::ComputeTransforms(&tree);
     property_trees.ResetCachedData();
 
     gfx::Transform flattened_rotation_about_x = rotation_about_x;
     flattened_rotation_about_x.FlattenTo2d();
 
-    EXPECT_TRANSFORMATION_MATRIX_EQ(rotation_about_x,
-                                    tree.ToTarget(child, effect_parent));
+    gfx::Transform to_target;
+    property_trees.GetToTarget(child, effect_parent, &to_target);
+    EXPECT_TRANSFORMATION_MATRIX_EQ(rotation_about_x, to_target);
 
     EXPECT_TRANSFORMATION_MATRIX_EQ(
         flattened_rotation_about_x * rotation_about_x, tree.ToScreen(child));
 
+    property_trees.GetToTarget(grand_child, effect_parent, &to_target);
     EXPECT_TRANSFORMATION_MATRIX_EQ(
-        flattened_rotation_about_x * rotation_about_x,
-        tree.ToTarget(grand_child, effect_parent));
+        flattened_rotation_about_x * rotation_about_x, to_target);
 
     EXPECT_TRANSFORMATION_MATRIX_EQ(flattened_rotation_about_x *
                                         flattened_rotation_about_x *
                                         rotation_about_x,
                                     tree.ToScreen(grand_child));
 
     gfx::Transform grand_child_to_child;
-    bool success =
-        tree.ComputeTransform(grand_child, child, &grand_child_to_child);
+    bool success = tree.ComputeTransformForTesting(grand_child, child,
+                                                   &grand_child_to_child);
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(rotation_about_x, grand_child_to_child);
 
     // Remove flattening at grand_child, and recompute transforms.
     tree.Node(grand_child)->flattens_inherited_transform = false;
     tree.set_needs_update(true);
     SetupTransformTreeForTest(&tree);
     draw_property_utils::ComputeTransforms(&tree);
 
+    property_trees.GetToTarget(grand_child, effect_parent, &to_target);
     EXPECT_TRANSFORMATION_MATRIX_EQ(rotation_about_x * rotation_about_x,
-                                    tree.ToTarget(grand_child, effect_parent));
+                                    to_target);
 
     EXPECT_TRANSFORMATION_MATRIX_EQ(
         flattened_rotation_about_x * rotation_about_x * rotation_about_x,
         tree.ToScreen(grand_child));
 
-    success = tree.ComputeTransform(grand_child, child, &grand_child_to_child);
+    success = tree.ComputeTransformForTesting(grand_child, child,
+                                              &grand_child_to_child);
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(rotation_about_x, grand_child_to_child);
   }
 };
 
 DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F(
     PropertyTreeTestTransformsWithFlattening);
 
 class PropertyTreeTestMultiplicationOrder : public PropertyTreeTest {
  protected:
@@ skipping 14 matching lines @@
     SetupTransformTreeForTest(&tree);
     tree.UpdateTransforms(1);
 
     gfx::Transform expected;
     expected.Translate(2, 2);
     expected.Scale(2, 2);
 
     gfx::Transform transform;
     gfx::Transform inverse;
 
-    bool success = tree.ComputeTransform(1, -1, &transform);
+    bool success = tree.ComputeTransformForTesting(1, -1, &transform);
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
 
-    success = tree.ComputeTransform(-1, 1, &inverse);
+    success = tree.ComputeTransformForTesting(-1, 1, &inverse);
     EXPECT_TRUE(success);
 
     transform = transform * inverse;
     expected.MakeIdentity();
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
   }
 };
 
 DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F(PropertyTreeTestMultiplicationOrder);
 
@@ skipping 15 matching lines @@
 
     SetupTransformTreeForTest(&tree);
     tree.UpdateTransforms(1);
 
     gfx::Transform expected;
     expected.Scale(0, 0);
 
     gfx::Transform transform;
     gfx::Transform inverse;
 
-    bool success = tree.ComputeTransform(1, 0, &transform);
+    bool success = tree.ComputeTransformForTesting(1, 0, &transform);
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
 
     // To compute this would require inverting the 0 matrix, so we cannot
     // succeed.
-    success = tree.ComputeTransform(0, 1, &inverse);
+    success = tree.ComputeTransformForTesting(0, 1, &inverse);
     EXPECT_FALSE(success);
   }
 };
 
 DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F(
     PropertyTreeTestComputeTransformWithUninvertibleTransform);
 
-class PropertyTreeTestComputeTransformWithSurfaceContentsScale
-    : public PropertyTreeTest {
- protected:
-  void StartTest() override {
-    PropertyTrees property_trees;
-    TransformTree& tree = property_trees.transform_tree;
-    TransformNode& root = *tree.Node(0);
-    root.id = 0;
-    tree.SetTargetId(root.id, 0);
-    tree.UpdateTransforms(0);
-
-    TransformNode grand_parent;
-    grand_parent.local.Scale(2.f, 2.f);
-    grand_parent.source_node_id = 0;
-    grand_parent.needs_surface_contents_scale = true;
-    int grand_parent_id = tree.Insert(grand_parent, 0);
-    tree.SetTargetId(grand_parent_id, 0);
-    tree.UpdateTransforms(grand_parent_id);
-
-    TransformNode parent;
-    parent.local.Translate(15.f, 15.f);
-    parent.source_node_id = grand_parent_id;
-    int parent_id = tree.Insert(parent, grand_parent_id);
-    tree.SetTargetId(parent_id, grand_parent_id);
-    tree.UpdateTransforms(parent_id);
-
-    TransformNode child;
-    child.local.Scale(3.f, 3.f);
-    child.source_node_id = parent_id;
-    int child_id = tree.Insert(child, parent_id);
-    tree.SetTargetId(child_id, grand_parent_id);
-    tree.UpdateTransforms(child_id);
-
-    TransformNode grand_child;
-    grand_child.local.Scale(5.f, 5.f);
-    grand_child.source_node_id = child_id;
-    grand_child.needs_surface_contents_scale = true;
-    int grand_child_id = tree.Insert(grand_child, child_id);
-    tree.SetTargetId(grand_child_id, grand_parent_id);
-    SetupTransformTreeForTest(&tree);
-    tree.UpdateTransforms(grand_child_id);
-
-    EXPECT_EQ(gfx::Vector2dF(2.f, 2.f),
-              tree.Node(grand_parent_id)->surface_contents_scale);
-    EXPECT_EQ(gfx::Vector2dF(30.f, 30.f),
-              tree.Node(grand_child_id)->surface_contents_scale);
-
-    // Compute transform from grand_parent to grand_child.
-    gfx::Transform expected_transform_without_surface_contents_scale;
-    expected_transform_without_surface_contents_scale.Scale(1.f / 15.f,
-                                                            1.f / 15.f);
-    expected_transform_without_surface_contents_scale.Translate(-15.f, -15.f);
-
-    gfx::Transform expected_transform_with_dest_surface_contents_scale;
-    expected_transform_with_dest_surface_contents_scale.Scale(30.f, 30.f);
-    expected_transform_with_dest_surface_contents_scale.Scale(1.f / 15.f,
-                                                              1.f / 15.f);
-    expected_transform_with_dest_surface_contents_scale.Translate(-15.f, -15.f);
-
-    gfx::Transform expected_transform_with_source_surface_contents_scale;
-    expected_transform_with_source_surface_contents_scale.Scale(1.f / 15.f,
-                                                                1.f / 15.f);
-    expected_transform_with_source_surface_contents_scale.Translate(-15.f,
-                                                                    -15.f);
-    expected_transform_with_source_surface_contents_scale.Scale(0.5f, 0.5f);
-
-    gfx::Transform transform;
-    bool success =
-        tree.ComputeTransform(grand_parent_id, grand_child_id, &transform);
-    EXPECT_TRUE(success);
-    EXPECT_TRANSFORMATION_MATRIX_EQ(
-        expected_transform_without_surface_contents_scale, transform);
-
-    success =
-        tree.ComputeTransform(grand_parent_id, grand_child_id, &transform);
-    const TransformNode* grand_child_node = tree.Node(grand_child_id);
-    transform.matrix().postScale(grand_child_node->surface_contents_scale.x(),
-                                 grand_child_node->surface_contents_scale.y(),
-                                 1.f);
-    EXPECT_TRUE(success);
-    EXPECT_TRANSFORMATION_MATRIX_EQ(
-        expected_transform_with_dest_surface_contents_scale, transform);
-
-    success =
-        tree.ComputeTransform(grand_parent_id, grand_child_id, &transform);
-    const TransformNode* grand_parent_node = tree.Node(grand_parent_id);
-    EXPECT_NE(grand_parent_node->surface_contents_scale.x(), 0.f);
-    EXPECT_NE(grand_parent_node->surface_contents_scale.y(), 0.f);
-    transform.Scale(1.0 / grand_parent_node->surface_contents_scale.x(),
-                    1.0 / grand_parent_node->surface_contents_scale.y());
-    EXPECT_TRUE(success);
-    EXPECT_TRANSFORMATION_MATRIX_EQ(
-        expected_transform_with_source_surface_contents_scale, transform);
-
-    // Now compute transform from grand_child to grand_parent.
-    expected_transform_without_surface_contents_scale.MakeIdentity();
-    expected_transform_without_surface_contents_scale.Translate(15.f, 15.f);
-    expected_transform_without_surface_contents_scale.Scale(15.f, 15.f);
-
-    expected_transform_with_dest_surface_contents_scale.MakeIdentity();
-    expected_transform_with_dest_surface_contents_scale.Scale(2.f, 2.f);
-    expected_transform_with_dest_surface_contents_scale.Translate(15.f, 15.f);
-    expected_transform_with_dest_surface_contents_scale.Scale(15.f, 15.f);
-
-    expected_transform_with_source_surface_contents_scale.MakeIdentity();
-    expected_transform_with_source_surface_contents_scale.Translate(15.f, 15.f);
-    expected_transform_with_source_surface_contents_scale.Scale(15.f, 15.f);
-    expected_transform_with_source_surface_contents_scale.Scale(1.f / 30.f,
-                                                                1.f / 30.f);
-
-    success =
-        tree.ComputeTransform(grand_child_id, grand_parent_id, &transform);
-    EXPECT_TRUE(success);
-    EXPECT_TRANSFORMATION_MATRIX_EQ(
-        expected_transform_without_surface_contents_scale, transform);
-
-    success =
-        tree.ComputeTransform(grand_child_id, grand_parent_id, &transform);
-    transform.matrix().postScale(grand_parent_node->surface_contents_scale.x(),
-                                 grand_parent_node->surface_contents_scale.y(),
-                                 1.f);
-    EXPECT_TRUE(success);
-    EXPECT_TRANSFORMATION_MATRIX_EQ(
-        expected_transform_with_dest_surface_contents_scale, transform);
-
-    success =
-        tree.ComputeTransform(grand_child_id, grand_parent_id, &transform);
-    EXPECT_NE(grand_child_node->surface_contents_scale.x(), 0.f);
-    EXPECT_NE(grand_child_node->surface_contents_scale.y(), 0.f);
-    transform.Scale(1.0 / grand_child_node->surface_contents_scale.x(),
-                    1.0 / grand_child_node->surface_contents_scale.y());
-    EXPECT_TRUE(success);
-    EXPECT_TRANSFORMATION_MATRIX_EQ(
-        expected_transform_with_source_surface_contents_scale, transform);
-  }
-};
-
-DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F(
-    PropertyTreeTestComputeTransformWithSurfaceContentsScale);
-
 class PropertyTreeTestComputeTransformToTargetWithZeroSurfaceContentsScale
     : public PropertyTreeTest {
  protected:
   void StartTest() override {
     PropertyTrees property_trees;
     TransformTree& tree = property_trees.transform_tree;
     TransformNode& root = *tree.Node(0);
     tree.SetTargetId(root.id, 0);
     tree.UpdateTransforms(0);
 
     TransformNode grand_parent;
     grand_parent.local.Scale(2.f, 0.f);
     grand_parent.source_node_id = 0;
-    grand_parent.needs_surface_contents_scale = true;
     int grand_parent_id = tree.Insert(grand_parent, 0);
     tree.SetTargetId(grand_parent_id, 0);
     tree.SetContentTargetId(grand_parent_id, grand_parent_id);
     tree.UpdateTransforms(grand_parent_id);
 
     TransformNode parent;
     parent.local.Translate(1.f, 1.f);
     parent.source_node_id = grand_parent_id;
     int parent_id = tree.Insert(parent, grand_parent_id);
     tree.SetTargetId(parent_id, grand_parent_id);
     tree.SetContentTargetId(parent_id, grand_parent_id);
     tree.UpdateTransforms(parent_id);
 
     TransformNode child;
     child.local.Translate(3.f, 4.f);
     child.source_node_id = parent_id;
     int child_id = tree.Insert(child, parent_id);
     tree.SetTargetId(child_id, grand_parent_id);
     tree.SetContentTargetId(child_id, grand_parent_id);
     SetupTransformTreeForTest(&tree);
     tree.UpdateTransforms(child_id);
 
     gfx::Transform expected_transform;
     expected_transform.Translate(4.f, 5.f);
 
     gfx::Transform transform;
-    bool success = tree.ComputeTransform(child_id, grand_parent_id, &transform);
+    bool success =
+        tree.ComputeTransformForTesting(child_id, grand_parent_id, &transform);
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected_transform, transform);
 
     tree.Node(grand_parent_id)->local.MakeIdentity();
     tree.Node(grand_parent_id)->local.Scale(0.f, 2.f);
     tree.Node(grand_parent_id)->needs_local_transform_update = true;
     tree.set_needs_update(true);
     SetupTransformTreeForTest(&tree);
 
     draw_property_utils::ComputeTransforms(&tree);
 
-    success = tree.ComputeTransform(child_id, grand_parent_id, &transform);
+    success =
+        tree.ComputeTransformForTesting(child_id, grand_parent_id, &transform);
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected_transform, transform);
 
     tree.Node(grand_parent_id)->local.MakeIdentity();
     tree.Node(grand_parent_id)->local.Scale(0.f, 0.f);
     tree.Node(grand_parent_id)->needs_local_transform_update = true;
     tree.set_needs_update(true);
     SetupTransformTreeForTest(&tree);
 
     draw_property_utils::ComputeTransforms(&tree);
 
-    success = tree.ComputeTransform(child_id, grand_parent_id, &transform);
+    success =
+        tree.ComputeTransformForTesting(child_id, grand_parent_id, &transform);
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected_transform, transform);
   }
 };
 
 DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F(
     PropertyTreeTestComputeTransformToTargetWithZeroSurfaceContentsScale);
 
 class PropertyTreeTestFlatteningWhenDestinationHasOnlyFlatAncestors
     : public PropertyTreeTest {
@@ skipping 27 matching lines @@
     tree.Node(grand_child)->flattens_inherited_transform = true;
 
     tree.set_needs_update(true);
     SetupTransformTreeForTest(&tree);
     draw_property_utils::ComputeTransforms(&tree);
 
     gfx::Transform flattened_rotation_about_x = rotation_about_x;
     flattened_rotation_about_x.FlattenTo2d();
 
     gfx::Transform grand_child_to_parent;
-    bool success =
-        tree.ComputeTransform(grand_child, parent, &grand_child_to_parent);
+    bool success = tree.ComputeTransformForTesting(grand_child, parent,
+                                                   &grand_child_to_parent);
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(flattened_rotation_about_x,
                                     grand_child_to_parent);
   }
 };
 
 DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F(
     PropertyTreeTestFlatteningWhenDestinationHasOnlyFlatAncestors);
 
 class PropertyTreeTestScreenSpaceOpacityUpdateTest : public PropertyTreeTest {
@@ skipping 104 matching lines @@
     child_node->local.Scale3d(6.0f, 6.0f, 0.0f);
     child_node->local.Translate(1.3f, 1.3f);
     child_node->source_node_id = parent;
     tree.set_needs_update(true);
 
     SetupTransformTreeForTest(&tree);
     draw_property_utils::ComputeTransforms(&tree);
     property_trees.ResetCachedData();
 
     gfx::Transform from_target;
-    EXPECT_FALSE(tree.ToTarget(child, effect_parent).GetInverse(&from_target));
+    gfx::Transform to_target;
+    property_trees.GetToTarget(child, effect_parent, &to_target);
+    EXPECT_FALSE(to_target.GetInverse(&from_target));
     // The following checks are to ensure that snapping is skipped because of
     // singular transform (and not because of other reasons which also cause
     // snapping to be skipped).
     EXPECT_TRUE(child_node->scrolls);
-    EXPECT_TRUE(tree.ToTarget(child, effect_parent).IsScaleOrTranslation());
+    property_trees.GetToTarget(child, effect_parent, &to_target);
+    EXPECT_TRUE(to_target.IsScaleOrTranslation());
     EXPECT_FALSE(child_node->to_screen_is_potentially_animated);
     EXPECT_FALSE(child_node->ancestors_are_invertible);
 
-    gfx::Transform rounded = tree.ToTarget(child, effect_parent);
+    gfx::Transform rounded;
+    property_trees.GetToTarget(child, effect_parent, &rounded);
     rounded.RoundTranslationComponents();
-    EXPECT_NE(tree.ToTarget(child, effect_parent), rounded);
+    property_trees.GetToTarget(child, effect_parent, &to_target);
+    EXPECT_NE(to_target, rounded);
   }
 };
 
 DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F(
     PropertyTreeTestSingularTransformSnapTest);
 
 #undef DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F
 #undef SERIALIZED_PROPERTY_TREE_TEST_F
 #undef DIRECT_PROPERTY_TREE_TEST_F
 
 }  // namespace
 }  // namespace cc