cc: Use sublayer scale from effect tree (2)

cc/trees/property_tree_unittest.cc

Index: cc/trees/property_tree_unittest.cc
diff --git a/cc/trees/property_tree_unittest.cc b/cc/trees/property_tree_unittest.cc
index 789761c8f3384f52b66c124137c713375378837c..e50b2e4ddaee5930ee1f50488750bde3976dda06 100644
--- a/cc/trees/property_tree_unittest.cc
+++ b/cc/trees/property_tree_unittest.cc
@@ -830,8 +830,13 @@ class PropertyTreeTestComputeTransformWithSublayerScale
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected_transform_with_dest_sublayer_scale,
                                     transform);
 
-    success = tree.ComputeTransformWithSourceSublayerScale(
-        grand_parent_id, grand_child_id, &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->sublayer_scale.x(), 0.f);
+    EXPECT_NE(grand_parent_node->sublayer_scale.y(), 0.f);
+    transform.Scale(1.0 / grand_parent_node->sublayer_scale.x(),
+                    1.0 / grand_parent_node->sublayer_scale.y());
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(
         expected_transform_with_source_sublayer_scale, transform);
@@ -863,8 +868,13 @@ class PropertyTreeTestComputeTransformWithSublayerScale
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected_transform_with_dest_sublayer_scale,
                                     transform);
 
-    success = tree.ComputeTransformWithSourceSublayerScale(
-        grand_child_id, grand_parent_id, &transform);
+    success =
+        tree.ComputeTransform(grand_child_id, grand_parent_id, &transform);
+    const TransformNode* grand_child_node = tree.Node(grand_child_id);
+    EXPECT_NE(grand_child_node->sublayer_scale.x(), 0.f);
+    EXPECT_NE(grand_child_node->sublayer_scale.y(), 0.f);
+    transform.Scale(1.0 / grand_child_node->sublayer_scale.x(),
+                    1.0 / grand_child_node->sublayer_scale.y());
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(
         expected_transform_with_source_sublayer_scale, transform);