gfx: Make conversions from gfx::Point to PointF explicit.

cc/layers/delegated_renderer_layer_impl_unittest.cc

 // Copyright 2012 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/delegated_renderer_layer_impl.h"
 
 #include "cc/base/scoped_ptr_vector.h"
 #include "cc/layers/solid_color_layer_impl.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/solid_color_draw_quad.h"
@@ skipping 53 matching lines @@
         SolidColorLayerImpl::Create(host_impl_->active_tree(), 2);
     scoped_ptr<LayerImpl> layer_after =
         SolidColorLayerImpl::Create(host_impl_->active_tree(), 3);
     scoped_ptr<FakeDelegatedRendererLayerImpl> delegated_renderer_layer =
         FakeDelegatedRendererLayerImpl::Create(host_impl_->active_tree(), 4);
 
     host_impl_->SetViewportSize(gfx::Size(100, 100));
     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;
     transform.Translate(1.0, 1.0);
     delegated_renderer_layer->SetTransform(transform);
 
     RenderPassList delegated_render_passes;
     RenderPass* pass1 =
         AddRenderPass(&delegated_render_passes, RenderPassId(9, 6),
                       gfx::Rect(6, 6, 6, 6), gfx::Transform(1, 0, 0, 1, 5, 6));
@@ skipping 39 matching lines @@
   {
     scoped_ptr<LayerImpl> root_layer =
         SolidColorLayerImpl::Create(host_impl_->active_tree(), 1);
     scoped_ptr<FakeDelegatedRendererLayerImpl> delegated_renderer_layer =
         FakeDelegatedRendererLayerImpl::Create(host_impl_->active_tree(), 2);
 
     host_impl_->SetViewportSize(gfx::Size(100, 100));
     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);
     gfx::Transform transform;
     transform.Translate(1.0, 1.0);
     delegated_renderer_layer->SetTransform(transform);
 
     RenderPassList delegated_render_passes;
     RenderPass* pass1 =
         AddRenderPass(&delegated_render_passes, RenderPassId(9, 6),
@@ skipping 58 matching lines @@
     host_impl_->CreatePendingTree();
     scoped_ptr<LayerImpl> root_layer =
         SolidColorLayerImpl::Create(host_impl_->pending_tree(), 1);
     scoped_ptr<FakeDelegatedRendererLayerImpl> delegated_renderer_layer =
         FakeDelegatedRendererLayerImpl::Create(host_impl_->pending_tree(), 2);
 
     host_impl_->SetViewportSize(gfx::Size(100, 100));
     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);
     gfx::Transform transform;
     transform.Translate(1.0, 1.0);
     delegated_renderer_layer->SetTransform(transform);
 
     RenderPassList delegated_render_passes;
     RenderPass* pass1 =
         AddRenderPass(&delegated_render_passes, RenderPassId(9, 6),
@@ skipping 383 matching lines @@
 
     scoped_ptr<LayerImpl> root_layer = LayerImpl::Create(
         host_impl_->active_tree(), 1);
     scoped_ptr<FakeDelegatedRendererLayerImpl> delegated_renderer_layer =
         FakeDelegatedRendererLayerImpl::Create(host_impl_->active_tree(), 2);
 
     host_impl_->SetViewportSize(gfx::Size(200, 200));
     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;
     transform.Scale(2.0, 2.0);
     transform.Translate(8.0, 8.0);
     delegated_renderer_layer->SetTransform(transform);
 
     RenderPassList delegated_render_passes;
 
     gfx::Size child_pass_bounds(7, 7);
@@ skipping 405 matching lines @@
         FakeDelegatedRendererLayerImpl::Create(host_impl_->active_tree(), 2);
     scoped_ptr<LayerImpl> clip_layer =
         LayerImpl::Create(host_impl_->active_tree(), 3);
     scoped_ptr<LayerImpl> origin_layer =
         LayerImpl::Create(host_impl_->active_tree(), 4);
 
     host_impl_->SetViewportSize(gfx::Size(100, 100));
     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);
 
     RenderPassList delegated_render_passes;
 
     gfx::Size child_pass_bounds(7, 7);
     gfx::Rect child_pass_rect(20, 20, 7, 7);
     gfx::Transform child_pass_transform;
     gfx::Rect child_pass_clip_rect(21, 21, 3, 3);
     bool child_pass_clipped = false;
@@ skipping 82 matching lines @@
                        4u,
                        false);
 
     delegated_renderer_layer->SetFrameDataForRenderPasses(
         1.f, delegated_render_passes);
 
     root_layer_ = root_layer.get();
     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 different units

[danakj, 2015/10/12 17:32:01]

Ya, it's because Layer::Position and Layer::Size are different though. Positions
can be sub-pixel, sizes can't from blink.

 
-      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());
       root_layer->AddChild(clip_layer.Pass());
     } else {
       root_layer->AddChild(delegated_renderer_layer.Pass());
     }
 
     host_impl_->active_tree()->SetRootLayer(root_layer.Pass());
   }
@@ skipping 494 matching lines @@
   scoped_ptr<DelegatedRendererLayerImpl> other_layer =
       DelegatedRendererLayerImpl::Create(host_impl_->active_tree(), 6);
 
   delegated_renderer_layer_impl->PushPropertiesTo(other_layer.get());
 
   EXPECT_EQ(0.5f, other_layer->inverse_device_scale_factor());
 }
 
 }  // namespace
 }  // namespace cc