| Index: cc/layers/layer_utils_unittest.cc
|
| diff --git a/cc/layers/layer_utils_unittest.cc b/cc/layers/layer_utils_unittest.cc
|
| index e5d82fdc782b8d7c25085a41f3d17cb0abeb0c44..b00404cf9e777b9bbf0b5421584e133ce87a19c8 100644
|
| --- a/cc/layers/layer_utils_unittest.cc
|
| +++ b/cc/layers/layer_utils_unittest.cc
|
| @@ -255,7 +255,7 @@ TEST_F(LayerUtilsGetAnimationBoundsTest, RotateXWithPerspective) {
|
|
|
| gfx::Transform perspective;
|
| perspective.ApplyPerspectiveDepth(100.f);
|
| - parent1()->SetTransform(perspective);
|
| + parent1()->test_properties()->transform = perspective;
|
|
|
| gfx::Size bounds(100, 100);
|
| child1()->SetDrawsContent(true);
|
| @@ -296,7 +296,7 @@ TEST_F(LayerUtilsGetAnimationBoundsTest, RotateXWithPerspectiveOnSameLayer) {
|
|
|
| gfx::Transform perspective;
|
| perspective.ApplyPerspectiveDepth(100.f);
|
| - parent1()->SetTransform(perspective);
|
| + parent1()->test_properties()->transform = perspective;
|
|
|
| gfx::Size bounds(100, 100);
|
| child1()->SetDrawsContent(true);
|
| @@ -398,7 +398,7 @@ TEST_F(LayerUtilsGetAnimationBoundsTest,
|
| 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);
|
| + child2()->test_properties()->transform = translate_2d_transform;
|
| great_grand_child()->SetDrawsContent(true);
|
| great_grand_child()->SetPosition(gfx::PointF(150.f, 50.f));
|
| great_grand_child()->SetBounds(gfx::Size(100, 200));
|
| @@ -427,7 +427,7 @@ TEST_F(LayerUtilsGetAnimationBoundsTest,
|
| 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);
|
| + child2()->test_properties()->transform = translate_2d_transform;
|
|
|
| gfx::Size bounds(100, 100);
|
| grand_child()->SetPosition(gfx::PointF(150.f, 50.f));
|
| @@ -476,7 +476,7 @@ TEST_F(LayerUtilsGetAnimationBoundsTest,
|
|
|
| root()->SetBounds(gfx::Size(350, 200));
|
| parent2()->SetPosition(gfx::PointF(40.f, 45.f));
|
| - child2()->SetTransform(translate_2d_transform);
|
| + child2()->test_properties()->transform = translate_2d_transform;
|
|
|
| gfx::Transform perspective;
|
| perspective.ApplyPerspectiveDepth(100.f);
|
| @@ -484,7 +484,7 @@ TEST_F(LayerUtilsGetAnimationBoundsTest,
|
| 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()->test_properties()->transform = perspective;
|
| grand_child()->test_properties()->transform_origin =
|
| gfx::Point3F(bounds.width() * 0.5f, bounds.height() * 0.5f, 0);
|
|
|
| @@ -558,7 +558,7 @@ TEST_F(LayerUtilsGetAnimationBoundsTest,
|
|
|
| root()->SetBounds(gfx::Size(350, 200));
|
| parent2()->SetPosition(gfx::PointF(40.f, 45.f));
|
| - child2()->SetTransform(translate_2d_transform);
|
| + child2()->test_properties()->transform = translate_2d_transform;
|
|
|
| gfx::Size bounds(100.f, 100.f);
|
| grand_child()->SetPosition(gfx::PointF(150.f, 50.f));
|
|
|