gfx: Make conversions from Size to SizeF be explicit.

cc/tiles/picture_layer_tiling_set_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/tiles/picture_layer_tiling_set.h"
 
 #include <map>
 #include <vector>
 
 #include "cc/resources/resource_provider.h"
@@ skipping 27 matching lines @@
 
   scoped_refptr<FakeDisplayListRasterSource> raster_source =
       FakeDisplayListRasterSource::CreateEmpty(layer_bounds);
 
   set->AddTiling(1.0, raster_source);
   set->AddTiling(1.5, raster_source);
   set->AddTiling(2.0, raster_source);
 
   float contents_scale = 2.0;
   gfx::Size content_bounds(
-      gfx::ToCeiledSize(gfx::ScaleSize(layer_bounds, contents_scale)));
+      gfx::ScaleToCeiledSize(layer_bounds, contents_scale));
   gfx::Rect content_rect(content_bounds);
 
   Region remaining(content_rect);
   PictureLayerTilingSet::CoverageIterator iter(set.get(), contents_scale,
                                                content_rect, contents_scale);
   for (; iter; ++iter) {
     gfx::Rect geometry_rect = iter.geometry_rect();
     EXPECT_TRUE(content_rect.Contains(geometry_rect));
     ASSERT_TRUE(remaining.Contains(geometry_rect));
     remaining.Subtract(geometry_rect);
@@ skipping 173 matching lines @@
     for (int i = 0; i < num_tilings; ++i, scale += scale_increment) {
       PictureLayerTiling* tiling = set->AddTiling(scale, raster_source);
       tiling->set_resolution(HIGH_RESOLUTION);
       tiling->CreateAllTilesForTesting();
       std::vector<Tile*> tiles = tiling->AllTilesForTesting();
       client.tile_manager()->InitializeTilesWithResourcesForTesting(tiles);
     }
 
     float max_contents_scale = scale;
     gfx::Size content_bounds(
-        gfx::ToCeiledSize(gfx::ScaleSize(layer_bounds, max_contents_scale)));
+        gfx::ScaleToCeiledSize(layer_bounds, max_contents_scale));
     gfx::Rect content_rect(content_bounds);
 
     Region remaining(content_rect);
     PictureLayerTilingSet::CoverageIterator iter(
         set.get(), max_contents_scale, content_rect, ideal_contents_scale);
     for (; iter; ++iter) {
       gfx::Rect geometry_rect = iter.geometry_rect();
       EXPECT_TRUE(content_rect.Contains(geometry_rect));
       ASSERT_TRUE(remaining.Contains(geometry_rect));
       remaining.Subtract(geometry_rect);
@@ skipping 198 matching lines @@
 
   // Clone from the pending to the active tree with the same max content size.
   active_set->UpdateTilingsToCurrentRasterSourceForActivation(
       raster_source.get(), pending_set.get(), Region(), 1.f, max_content_scale);
   // All the tilings are on the active tree.
   EXPECT_EQ(2u, active_set->num_tilings());
 }
 
 }  // namespace
 }  // namespace cc