Chromium Code Reviews| Index: cc/layers/delegated_renderer_layer_impl_unittest.cc |
| diff --git a/cc/layers/delegated_renderer_layer_impl_unittest.cc b/cc/layers/delegated_renderer_layer_impl_unittest.cc |
| index 5deef6c11bc5f1c590f5bfe149796729fbea11b8..fef501eeca45124de2cb86efda79dc3511d7d0a9 100644 |
| --- a/cc/layers/delegated_renderer_layer_impl_unittest.cc |
| +++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc |
| @@ -71,17 +71,17 @@ class DelegatedRendererLayerImplTestSimple |
| root_layer->SetBounds(gfx::Size(100, 100)); |
| root_layer->SetHasRenderSurface(true); |
| - layer_before->SetPosition(gfx::Point(20, 20)); |
| + layer_before->SetPosition(gfx::PointF(20.f, 20.f)); |
| layer_before->SetBounds(gfx::Size(14, 14)); |
| layer_before->SetDrawsContent(true); |
| layer_before->SetHasRenderSurface(true); |
| - layer_after->SetPosition(gfx::Point(5, 5)); |
| + layer_after->SetPosition(gfx::PointF(5.f, 5.f)); |
| layer_after->SetBounds(gfx::Size(15, 15)); |
| layer_after->SetDrawsContent(true); |
| layer_after->SetHasRenderSurface(true); |
| - delegated_renderer_layer->SetPosition(gfx::Point(3, 3)); |
| + delegated_renderer_layer->SetPosition(gfx::PointF(3.f, 3.f)); |
| delegated_renderer_layer->SetBounds(gfx::Size(10, 10)); |
| delegated_renderer_layer->SetDrawsContent(true); |
| gfx::Transform transform; |
| @@ -141,7 +141,7 @@ TEST_F(DelegatedRendererLayerImplTest, |
| root_layer->SetBounds(gfx::Size(100, 100)); |
| root_layer->SetHasRenderSurface(true); |
| - delegated_renderer_layer->SetPosition(gfx::Point(3, 3)); |
| + delegated_renderer_layer->SetPosition(gfx::PointF(3.f, 3.f)); |
| delegated_renderer_layer->SetBounds(gfx::Size(10, 10)); |
| delegated_renderer_layer->SetDrawsContent(true); |
| delegated_renderer_layer->SetHasRenderSurface(true); |
| @@ -220,7 +220,7 @@ TEST_F(DelegatedRendererLayerImplTest, |
| root_layer->SetBounds(gfx::Size(100, 100)); |
| root_layer->SetHasRenderSurface(true); |
| - delegated_renderer_layer->SetPosition(gfx::Point(3, 3)); |
| + delegated_renderer_layer->SetPosition(gfx::PointF(3.f, 3.f)); |
| delegated_renderer_layer->SetBounds(gfx::Size(10, 10)); |
| delegated_renderer_layer->SetDrawsContent(true); |
| delegated_renderer_layer->SetHasRenderSurface(true); |
| @@ -624,7 +624,7 @@ class DelegatedRendererLayerImplTestTransform |
| root_layer->SetBounds(gfx::Size(100, 100)); |
| root_layer->SetHasRenderSurface(true); |
| - delegated_renderer_layer->SetPosition(gfx::Point(20, 20)); |
| + delegated_renderer_layer->SetPosition(gfx::PointF(20.f, 20.f)); |
| delegated_renderer_layer->SetBounds(gfx::Size(75, 75)); |
| delegated_renderer_layer->SetDrawsContent(true); |
| gfx::Transform transform; |
| @@ -1050,7 +1050,7 @@ class DelegatedRendererLayerImplTestClip |
| root_layer->SetBounds(gfx::Size(100, 100)); |
| root_layer->SetHasRenderSurface(true); |
| - delegated_renderer_layer->SetPosition(gfx::Point(20, 20)); |
| + delegated_renderer_layer->SetPosition(gfx::PointF(20.f, 20.f)); |
| delegated_renderer_layer->SetBounds(gfx::Size(50, 50)); |
| delegated_renderer_layer->SetDrawsContent(true); |
| @@ -1153,14 +1153,15 @@ class DelegatedRendererLayerImplTestClip |
| delegated_renderer_layer_ = delegated_renderer_layer.get(); |
| if (clip_delegated_renderer_layer_) { |
| - gfx::Rect clip_rect(21, 27, 23, 21); |
| + gfx::PointF clip_origin(21.f, 27.f); |
| + gfx::Size clip_size(23, 21); |
|
vmpstr
2015/09/29 05:04:26
It's a bit weird to have a origin and size be in d
danakj
2015/10/12 17:32:01
Ya, it's because Layer::Position and Layer::Size a
|
| - clip_layer->SetPosition(clip_rect.origin()); |
| - clip_layer->SetBounds(clip_rect.size()); |
| + clip_layer->SetPosition(clip_origin); |
| + clip_layer->SetBounds(clip_size); |
| clip_layer->SetMasksToBounds(true); |
| origin_layer->SetPosition( |
| - gfx::PointAtOffsetFromOrigin(-clip_rect.OffsetFromOrigin())); |
| + gfx::PointF(-clip_origin.x(), -clip_origin.y())); |
| origin_layer->AddChild(delegated_renderer_layer.Pass()); |
| clip_layer->AddChild(origin_layer.Pass()); |