gfx: Make conversions from Size to SizeF be explicit.

cc/playback/picture_pile_impl_unittest.cc

 // Copyright 2013 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 "base/memory/scoped_ptr.h"
 #include "cc/test/fake_picture_pile_impl.h"
 #include "cc/test/skia_common.h"
 #include "skia/ext/refptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
@@ skipping 274 matching lines @@
   white_paint.setColor(SK_ColorWHITE);
   recording_source->add_draw_rect_with_paint(gfx::Rect(layer_bounds),
                                              white_paint);
 
   recording_source->SetMinContentsScale(contents_scale);
   recording_source->Rerecord();
 
   scoped_refptr<FakePicturePileImpl> pile =
       FakePicturePileImpl::CreateFromPile(recording_source.get(), nullptr);
 
-  gfx::Size content_bounds(
-      gfx::ToCeiledSize(gfx::ScaleSize(layer_bounds, contents_scale)));
+  gfx::Size content_bounds =
+      gfx::ScaleToCeiledSize(layer_bounds, contents_scale);
 
   // Simulate drawing into different tiles at different offsets.
   int step_x = std::ceil(content_bounds.width() / raster_divisions);
   int step_y = std::ceil(content_bounds.height() / raster_divisions);
   for (int offset_x = 0; offset_x < content_bounds.width();
        offset_x += step_x) {
     for (int offset_y = 0; offset_y < content_bounds.height();
          offset_y += step_y) {
       gfx::Rect content_rect(offset_x, offset_y, step_x, step_y);
       content_rect.Intersect(gfx::Rect(content_bounds));
@@ skipping 37 matching lines @@
   scoped_ptr<FakePicturePile> recording_source =
       FakePicturePile::CreateFilledPile(tile_size, layer_bounds);
   recording_source->SetBackgroundColor(SK_ColorTRANSPARENT);
   recording_source->SetRequiresClear(true);
   recording_source->SetMinContentsScale(contents_scale);
   recording_source->SetClearCanvasWithDebugColor(false);
   recording_source->Rerecord();
 
   scoped_refptr<FakePicturePileImpl> pile =
       FakePicturePileImpl::CreateFromPile(recording_source.get(), nullptr);
-  gfx::Size content_bounds(
-      gfx::ToCeiledSize(gfx::ScaleSize(layer_bounds, contents_scale)));
+  gfx::Size content_bounds =
+      gfx::ScaleToCeiledSize(layer_bounds, contents_scale);
 
   gfx::Rect canvas_rect(content_bounds);
   canvas_rect.Inset(0, 0, -1, -1);
 
   SkBitmap bitmap;
   bitmap.allocN32Pixels(canvas_rect.width(), canvas_rect.height());
   SkCanvas canvas(bitmap);
 
   pile->PlaybackToCanvas(&canvas, canvas_rect, canvas_rect, contents_scale);
 
@@ skipping 28 matching lines @@
   color_paint.setColor(test_color);
   // Additive paint, so that if two paints overlap, the color will change.
   color_paint.setXfermodeMode(SkXfermode::kPlus_Mode);
   // Paint outside the layer to make sure that blending works.
   recording_source->add_draw_rect_with_paint(
       gfx::Rect(bigger_than_layer_bounds), color_paint);
   recording_source->Rerecord();
 
   scoped_refptr<FakePicturePileImpl> pile =
       FakePicturePileImpl::CreateFromPile(recording_source.get(), nullptr);
-  gfx::Size content_bounds(
-      gfx::ToCeiledSize(gfx::ScaleSize(layer_bounds, contents_scale)));
+  gfx::Size content_bounds =
+      gfx::ScaleToCeiledSize(layer_bounds, contents_scale);
 
   SkBitmap bitmap;
   bitmap.allocN32Pixels(content_bounds.width(), content_bounds.height());
   SkCanvas canvas(bitmap);
 
   pile->PlaybackToCanvas(&canvas, gfx::Rect(content_bounds),
                          gfx::Rect(content_bounds), contents_scale);
 
   for (int y = 0; y < bitmap.height(); y++) {
     for (int x = 0; x < bitmap.width(); x++) {
@@ skipping 115 matching lines @@
     EXPECT_TRUE(++iterator);
     EXPECT_TRUE(iterator->image == discardable_image[2].get());
     EXPECT_EQ(expected_rects[2].ToString(),
               gfx::SkRectToRectF(iterator->image_rect).ToString());
     EXPECT_FALSE(++iterator);
   }
 }
 
 }  // namespace
 }  // namespace cc