cc : Stop pushing transform origin from Layer and LayerImpl.

cc/layers/layer_utils_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/layers/layer_utils.h"
 
 #include "cc/animation/animation_host.h"
 #include "cc/animation/animation_id_provider.h"
 #include "cc/animation/transform_operations.h"
 #include "cc/layers/layer_impl.h"
@@ skipping 192 matching lines @@
 
   AddAnimatedTransformToLayerWithPlayer(child1()->id(), timeline(), duration,
                                         start, end);
 
   parent1()->SetBounds(gfx::Size(350, 200));
 
   gfx::Size bounds(100, 100);
   child1()->SetDrawsContent(true);
   child1()->SetPosition(gfx::PointF(150.f, 50.f));
   child1()->SetBounds(bounds);
-  child1()->SetTransformOrigin(
-      gfx::Point3F(bounds.width() * 0.5f, bounds.height() * 0.5f, 0));
+  child1()->test_properties()->transform_origin =
+      gfx::Point3F(bounds.width() * 0.5f, bounds.height() * 0.5f, 0);
 
   host_impl().active_tree()->BuildPropertyTreesForTesting();
 
   gfx::BoxF box;
   bool success = LayerUtils::GetAnimationBounds(*child1(), &box);
   EXPECT_TRUE(success);
   gfx::BoxF expected(150.f, 50.f, -50.f, 100.f, 100.f, 100.f);
   EXPECT_BOXF_EQ(expected, box);
 }
 
 TEST_F(LayerUtilsGetAnimationBoundsTest, RotateXWithPerspective) {
   double duration = 1.0;
 
   TransformOperations start;
   start.AppendRotate(1.f, 0.f, 0.f, 0.f);
   TransformOperations end;
   end.AppendRotate(1.f, 0.f, 0.f, 90.f);
 
   AddAnimatedTransformToLayerWithPlayer(child1()->id(), timeline(), duration,
                                         start, end);
 
   // Make the anchor point not the default 0.5 value and line up with the
   // child center to make the math easier.
-  parent1()->SetTransformOrigin(
-      gfx::Point3F(0.375f * 400.f, 0.375f * 400.f, 0.f));
+  parent1()->test_properties()->transform_origin =
+      gfx::Point3F(0.375f * 400.f, 0.375f * 400.f, 0.f);
   parent1()->SetBounds(gfx::Size(400, 400));
 
   gfx::Transform perspective;
   perspective.ApplyPerspectiveDepth(100.f);
   parent1()->SetTransform(perspective);
 
   gfx::Size bounds(100, 100);
   child1()->SetDrawsContent(true);
   child1()->SetPosition(gfx::PointF(100.f, 100.f));
   child1()->SetBounds(bounds);
-  child1()->SetTransformOrigin(
-      gfx::Point3F(bounds.width() * 0.5f, bounds.height() * 0.5f, 0));
+  child1()->test_properties()->transform_origin =
+      gfx::Point3F(bounds.width() * 0.5f, bounds.height() * 0.5f, 0);
 
   host_impl().active_tree()->BuildPropertyTreesForTesting();
 
   gfx::BoxF box;
   bool success = LayerUtils::GetAnimationBounds(*child1(), &box);
   EXPECT_TRUE(success);
   gfx::BoxF expected(50.f, 50.f, -33.333336f, 200.f, 200.f, 133.333344f);
   EXPECT_BOXF_EQ(expected, box);
 }
 
 TEST_F(LayerUtilsGetAnimationBoundsTest, RotateXWithPerspectiveOnSameLayer) {
   // This test is used to check whether GetAnimationBounds correctly ignores the
   // local transform when there is an animation applied to the layer / node.
   // The intended behavior is that the animation should overwrite the transform.
 
   double duration = 1.0;
 
   TransformOperations start;
   start.AppendRotate(1.f, 0.f, 0.f, 0.f);
   TransformOperations end;
   end.AppendRotate(1.f, 0.f, 0.f, 90.f);
 
   AddAnimatedTransformToLayerWithPlayer(parent1()->id(), timeline(), duration,
                                         start, end);
 
   // Make the anchor point not the default 0.5 value and line up
   // with the child center to make the math easier.
-  parent1()->SetTransformOrigin(
-      gfx::Point3F(0.375f * 400.f, 0.375f * 400.f, 0.f));
+  parent1()->test_properties()->transform_origin =
+      gfx::Point3F(0.375f * 400.f, 0.375f * 400.f, 0.f);
   parent1()->SetBounds(gfx::Size(400, 400));
 
   gfx::Transform perspective;
   perspective.ApplyPerspectiveDepth(100.f);
   parent1()->SetTransform(perspective);
 
   gfx::Size bounds(100, 100);
   child1()->SetDrawsContent(true);
   child1()->SetPosition(gfx::PointF(100.f, 100.f));
   child1()->SetBounds(bounds);
-  child1()->SetTransformOrigin(
-      gfx::Point3F(bounds.width() * 0.5f, bounds.height() * 0.5f, 0));
+  child1()->test_properties()->transform_origin =
+      gfx::Point3F(bounds.width() * 0.5f, bounds.height() * 0.5f, 0);
 
   host_impl().active_tree()->BuildPropertyTreesForTesting();
 
   gfx::BoxF box;
   bool success = LayerUtils::GetAnimationBounds(*child1(), &box);
   EXPECT_TRUE(success);
   gfx::BoxF expected(100.f, 100.f, -50.f, 100.f, 100.f, 100.f);
   EXPECT_BOXF_EQ(expected, box);
 }
 
 TEST_F(LayerUtilsGetAnimationBoundsTest, RotateZ) {
   double duration = 1.0;
 
   TransformOperations start;
   start.AppendRotate(0.f, 0.f, 1.f, 0.f);
   TransformOperations end;
   end.AppendRotate(0.f, 0.f, 1.f, 90.f);
   AddAnimatedTransformToLayerWithPlayer(child1()->id(), timeline(), duration,
                                         start, end);
 
   parent1()->SetBounds(gfx::Size(350, 200));
 
   gfx::Size bounds(100, 100);
   child1()->SetDrawsContent(true);
   child1()->SetPosition(gfx::PointF(150.f, 50.f));
   child1()->SetBounds(bounds);
-  child1()->SetTransformOrigin(
-      gfx::Point3F(bounds.width() * 0.5f, bounds.height() * 0.5f, 0));
+  child1()->test_properties()->transform_origin =
+      gfx::Point3F(bounds.width() * 0.5f, bounds.height() * 0.5f, 0);
 
   host_impl().active_tree()->BuildPropertyTreesForTesting();
 
   gfx::BoxF box;
   bool success = LayerUtils::GetAnimationBounds(*child1(), &box);
   EXPECT_TRUE(success);
   float diag = diagonal(bounds.width(), bounds.height());
   gfx::BoxF expected(150.f + 0.5f * (bounds.width() - diag),
                      50.f + 0.5f * (bounds.height() - diag),
                      0.f,
@@ skipping 78 matching lines @@
 
   gfx::Transform translate_2d_transform;
   translate_2d_transform.Translate(80.f, 60.f);
   root()->SetBounds(gfx::Size(350, 200));
   parent2()->SetPosition(gfx::PointF(40.f, 45.f));
   child2()->SetTransform(translate_2d_transform);
 
   gfx::Size bounds(100, 100);
   grand_child()->SetPosition(gfx::PointF(150.f, 50.f));
   grand_child()->SetBounds(bounds);
-  grand_child()->SetTransformOrigin(
-      gfx::Point3F(bounds.width() * 0.5f, bounds.height() * 0.5f, 0));
+  grand_child()->test_properties()->transform_origin =
+      gfx::Point3F(bounds.width() * 0.5f, bounds.height() * 0.5f, 0);
 
   great_grand_child()->SetPosition(gfx::PointF(25.f, 25.f));
   great_grand_child()->SetBounds(gfx::Size(50.f, 50.f));
   great_grand_child()->SetDrawsContent(true);
 
   host_impl().active_tree()->BuildPropertyTreesForTesting();
 
   gfx::BoxF box;
   bool success = LayerUtils::GetAnimationBounds(*great_grand_child(), &box);
   EXPECT_TRUE(success);
@@ skipping 30 matching lines @@
   parent2()->SetPosition(gfx::PointF(40.f, 45.f));
   child2()->SetTransform(translate_2d_transform);
 
   gfx::Transform perspective;
   perspective.ApplyPerspectiveDepth(100.f);
 
   gfx::Size bounds(100.f, 100.f);
   grand_child()->SetPosition(gfx::PointF(150.f, 50.f));
   grand_child()->SetBounds(bounds);
   grand_child()->SetTransform(perspective);
-  grand_child()->SetTransformOrigin(
-      gfx::Point3F(bounds.width() * 0.5f, bounds.height() * 0.5f, 0));
+  grand_child()->test_properties()->transform_origin =
+      gfx::Point3F(bounds.width() * 0.5f, bounds.height() * 0.5f, 0);
 
-  great_grand_child()->SetTransformOrigin(
-      gfx::Point3F(bounds.width() * 0.25f, bounds.height() * 0.25f, 0));
+  great_grand_child()->test_properties()->transform_origin =
+      gfx::Point3F(bounds.width() * 0.25f, bounds.height() * 0.25f, 0);
   great_grand_child()->SetPosition(gfx::PointF(25.f, 25.f));
   great_grand_child()->SetBounds(gfx::Size(50.f, 50.f));
   great_grand_child()->SetDrawsContent(true);
 
   host_impl().active_tree()->BuildPropertyTreesForTesting();
 
   gfx::BoxF box;
   bool success = LayerUtils::GetAnimationBounds(*great_grand_child(), &box);
   EXPECT_TRUE(success);
 
@@ skipping 53 matching lines @@
   translate_2d_transform.Translate(80.f, 60.f);
 
   root()->SetBounds(gfx::Size(350, 200));
   parent2()->SetPosition(gfx::PointF(40.f, 45.f));
   child2()->SetTransform(translate_2d_transform);
 
   gfx::Size bounds(100.f, 100.f);
   grand_child()->SetPosition(gfx::PointF(150.f, 50.f));
   grand_child()->SetBounds(bounds);
 
-  great_grand_child()->SetTransformOrigin(
-      gfx::Point3F(bounds.width() * 0.25f, bounds.height() * 0.25f, 0));
+  great_grand_child()->test_properties()->transform_origin =
+      gfx::Point3F(bounds.width() * 0.25f, bounds.height() * 0.25f, 0);
   great_grand_child()->SetPosition(gfx::PointF(25.f, 25.f));
   great_grand_child()->SetBounds(
       gfx::Size(bounds.width() * 0.5f, bounds.height() * 0.5f));
   great_grand_child()->SetDrawsContent(true);
 
   host_impl().active_tree()->BuildPropertyTreesForTesting();
 
   gfx::BoxF box;
   bool success = LayerUtils::GetAnimationBounds(*great_grand_child(), &box);
   EXPECT_TRUE(success);
 
   // Same as RotateXWithPerspectiveUnderAncestorsWithPositionOr2DTransform test,
   // except for the perspective calculations.
 
   gfx::BoxF expected(295.f, 180.f, -25.f, 50.f, 50.f, 50.f);
   EXPECT_BOXF_EQ(expected, box);
 }
 
 }  // namespace
 
 }  // namespace cc