| Index: cc/layers/layer_position_constraint_unittest.cc
|
| diff --git a/cc/layers/layer_position_constraint_unittest.cc b/cc/layers/layer_position_constraint_unittest.cc
|
| index cc112d1b157178ed79032e561ec8988ee8064e48..269bc9656c57af57147eeaad03061078b3bc2bc8 100644
|
| --- a/cc/layers/layer_position_constraint_unittest.cc
|
| +++ b/cc/layers/layer_position_constraint_unittest.cc
|
| @@ -19,13 +19,13 @@ namespace {
|
|
|
| void SetLayerPropertiesForTesting(LayerImpl* layer,
|
| const gfx::Transform& transform,
|
| - const gfx::PointF& anchor,
|
| + const gfx::Point3F& transform_origin,
|
| const gfx::PointF& position,
|
| const gfx::Size& bounds,
|
| bool flatten_transform,
|
| bool is_3d_sorted) {
|
| layer->SetTransform(transform);
|
| - layer->SetAnchorPoint(anchor);
|
| + layer->SetTransformOrigin(transform_origin);
|
| layer->SetPosition(position);
|
| layer->SetBounds(bounds);
|
| layer->SetShouldFlattenTransform(flatten_transform);
|
| @@ -87,34 +87,34 @@ class LayerPositionConstraintTest : public testing::Test {
|
| LayerImpl::Create(host_impl_.active_tree(), 4);
|
|
|
| gfx::Transform IdentityMatrix;
|
| - gfx::PointF anchor;
|
| + gfx::Point3F transform_origin;
|
| gfx::PointF position;
|
| gfx::Size bounds(200, 200);
|
| gfx::Size clip_bounds(100, 100);
|
| SetLayerPropertiesForTesting(scroll_layer.get(),
|
| IdentityMatrix,
|
| - anchor,
|
| + transform_origin,
|
| position,
|
| bounds,
|
| true,
|
| false);
|
| SetLayerPropertiesForTesting(child.get(),
|
| IdentityMatrix,
|
| - anchor,
|
| + transform_origin,
|
| position,
|
| bounds,
|
| true,
|
| false);
|
| SetLayerPropertiesForTesting(grand_child.get(),
|
| IdentityMatrix,
|
| - anchor,
|
| + transform_origin,
|
| position,
|
| bounds,
|
| true,
|
| false);
|
| SetLayerPropertiesForTesting(great_grand_child.get(),
|
| IdentityMatrix,
|
| - anchor,
|
| + transform_origin,
|
| position,
|
| bounds,
|
| true,
|
| @@ -741,7 +741,7 @@ TEST_F(LayerPositionConstraintTest,
|
| LayerImpl::Create(host_impl_.active_tree(), 5);
|
| SetLayerPropertiesForTesting(fixed_position_child.get(),
|
| identity,
|
| - gfx::PointF(),
|
| + gfx::Point3F(),
|
| gfx::PointF(),
|
| gfx::Size(100, 100),
|
| true,
|
|
|