| Index: cc/trees/layer_tree_host_pixeltest_masks.cc
|
| diff --git a/cc/trees/layer_tree_host_pixeltest_masks.cc b/cc/trees/layer_tree_host_pixeltest_masks.cc
|
| index ce9dde54c4da4132719381d13d0d80a3d52c9bd2..ba57e4ad9b70de5c6167640303967022a4d66439 100644
|
| --- a/cc/trees/layer_tree_host_pixeltest_masks.cc
|
| +++ b/cc/trees/layer_tree_host_pixeltest_masks.cc
|
| @@ -140,7 +140,7 @@ TEST_P(LayerTreeHostMasksPixelTest, MaskOfClippedLayer) {
|
|
|
| // Clip to the top half of the green layer.
|
| scoped_refptr<Layer> clip = Layer::Create(layer_settings());
|
| - clip->SetPosition(gfx::Point(0, 0));
|
| + clip->SetPosition(gfx::PointF());
|
| clip->SetBounds(gfx::Size(100, 50));
|
| clip->SetMasksToBounds(true);
|
| background->AddChild(clip);
|
| @@ -185,7 +185,7 @@ TEST_P(LayerTreeHostMasksPixelTest, MaskWithReplica) {
|
|
|
| scoped_refptr<Layer> replica = Layer::Create(layer_settings());
|
| replica->SetTransformOrigin(gfx::Point3F(25.f, 25.f, 0.f));
|
| - replica->SetPosition(gfx::Point(50, 50));
|
| + replica->SetPosition(gfx::PointF(50.f, 50.f));
|
| replica->SetTransform(replica_transform);
|
| green->SetReplicaLayer(replica.get());
|
|
|
| @@ -208,7 +208,7 @@ TEST_P(LayerTreeHostMasksPixelTest, MaskWithReplicaOfClippedLayer) {
|
| // Clip to the bottom half of the green layer, and the left half of the
|
| // replica.
|
| scoped_refptr<Layer> clip = Layer::Create(layer_settings());
|
| - clip->SetPosition(gfx::Point(0, 25));
|
| + clip->SetPosition(gfx::PointF(0.f, 25.f));
|
| clip->SetBounds(gfx::Size(75, 75));
|
| clip->SetMasksToBounds(true);
|
| background->AddChild(clip);
|
| @@ -223,7 +223,7 @@ TEST_P(LayerTreeHostMasksPixelTest, MaskWithReplicaOfClippedLayer) {
|
|
|
| scoped_refptr<Layer> replica = Layer::Create(layer_settings());
|
| replica->SetTransformOrigin(gfx::Point3F(25.f, 25.f, 0.f));
|
| - replica->SetPosition(gfx::Point(50, 50));
|
| + replica->SetPosition(gfx::PointF(50.f, 50.f));
|
| replica->SetTransform(replica_transform);
|
| green->SetReplicaLayer(replica.get());
|
|
|
| @@ -258,7 +258,7 @@ TEST_P(LayerTreeHostMasksPixelTest, MaskOfReplica) {
|
|
|
| scoped_refptr<Layer> replica = Layer::Create(layer_settings());
|
| replica->SetTransformOrigin(gfx::Point3F(50.f, 50.f, 0.f));
|
| - replica->SetPosition(gfx::Point());
|
| + replica->SetPosition(gfx::PointF());
|
| replica->SetTransform(replica_transform);
|
| replica->SetMaskLayer(mask.get());
|
| green->SetReplicaLayer(replica.get());
|
| @@ -281,7 +281,7 @@ TEST_P(LayerTreeHostMasksPixelTest, MaskOfReplicaOfClippedLayer) {
|
|
|
| // Clip to the bottom 3/4 of the green layer, and the top 3/4 of the replica.
|
| scoped_refptr<Layer> clip = Layer::Create(layer_settings());
|
| - clip->SetPosition(gfx::Point(0, 12));
|
| + clip->SetPosition(gfx::PointF(0.f, 12.f));
|
| clip->SetBounds(gfx::Size(100, 75));
|
| clip->SetMasksToBounds(true);
|
| background->AddChild(clip);
|
| @@ -300,7 +300,7 @@ TEST_P(LayerTreeHostMasksPixelTest, MaskOfReplicaOfClippedLayer) {
|
|
|
| scoped_refptr<Layer> replica = Layer::Create(layer_settings());
|
| replica->SetTransformOrigin(gfx::Point3F(50.f, 50.f, 0.f));
|
| - replica->SetPosition(gfx::Point());
|
| + replica->SetPosition(gfx::PointF());
|
| replica->SetTransform(replica_transform);
|
| replica->SetMaskLayer(mask.get());
|
| green->SetReplicaLayer(replica.get());
|
|
|