cc: Use sublayer scale from effect tree (2)

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 812 matching lines @@
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected_transform_without_sublayer_scale,
                                     transform);
 
     success = tree.ComputeTransformWithDestinationSublayerScale(
         grand_parent_id, grand_child_id, &transform);
     EXPECT_TRUE(success);
     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);
 
     // Now compute transform from grand_child to grand_parent.
     expected_transform_without_sublayer_scale.MakeIdentity();
     expected_transform_without_sublayer_scale.Translate(15.f, 15.f);
     expected_transform_without_sublayer_scale.Scale(15.f, 15.f);
 
     expected_transform_with_dest_sublayer_scale.MakeIdentity();
@@ skipping 11 matching lines @@
     EXPECT_TRUE(success);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected_transform_without_sublayer_scale,
                                     transform);
 
     success = tree.ComputeTransformWithDestinationSublayerScale(
         grand_child_id, grand_parent_id, &transform);
     EXPECT_TRUE(success);
     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);
   }
 };
 
 DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F(
     PropertyTreeTestComputeTransformWithSublayerScale);
 
 class PropertyTreeTestComputeTransformToTargetWithZeroSublayerScale
@@ skipping 237 matching lines @@
 
 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