gfx: Make conversions from Size to SizeF be explicit.

cc/layers/painted_scrollbar_layer.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 "cc/layers/painted_scrollbar_layer.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
@@ skipping 76 matching lines @@
 
 int PaintedScrollbarLayer::MaxTextureSize() {
   DCHECK(layer_tree_host());
   return layer_tree_host()->GetRendererCapabilities().max_texture_size;
 }
 
 float PaintedScrollbarLayer::ClampScaleToMaxTextureSize(float scale) {
   // If the scaled bounds() is bigger than the max texture size of the
   // device, we need to clamp it by rescaling, since this is used
   // below to set the texture size.
-  gfx::Size scaled_bounds = gfx::ToCeiledSize(gfx::ScaleSize(bounds(), scale));
+  gfx::Size scaled_bounds = gfx::ScaleToCeiledSize(bounds(), scale);
   if (scaled_bounds.width() > MaxTextureSize() ||
       scaled_bounds.height() > MaxTextureSize()) {
     if (scaled_bounds.width() > scaled_bounds.height())
       return (MaxTextureSize() - 1) / static_cast<float>(bounds().width());
     else
       return (MaxTextureSize() - 1) / static_cast<float>(bounds().height());
   }
   return scale;
 }
 
@@ skipping 103 matching lines @@
     transform = DrawTransformFromPropertyTrees(
         this, layer_tree_host()->property_trees()->transform_tree);
 
     gfx::Vector2dF transform_scales =
         MathUtil::ComputeTransform2dScaleComponents(transform, scale);
     scale = std::max(transform_scales.x(), transform_scales.y());
   }
   bool changed = false;
   changed |= UpdateProperty(ClampScaleToMaxTextureSize(scale),
                             &internal_contents_scale_);
-  changed |= UpdateProperty(
-      gfx::ToCeiledSize(gfx::ScaleSize(bounds(), internal_contents_scale_)),
-      &internal_content_bounds_);
+  changed |=
+      UpdateProperty(gfx::ScaleToCeiledSize(bounds(), internal_contents_scale_),
+                     &internal_content_bounds_);
   if (changed) {
     // If the content scale or bounds change, repaint.
     SetNeedsDisplay();
   }
 }
 
 bool PaintedScrollbarLayer::Update() {
   {
     base::AutoReset<bool> ignore_set_needs_commit(&ignore_set_needs_commit_,
                                                   true);
@@ skipping 77 matching lines @@
 
   scrollbar_->PaintPart(&skcanvas, part, layer_rect);
   // Make sure that the pixels are no longer mutable to unavoid unnecessary
   // allocation and copying.
   skbitmap.setImmutable();
 
   return UIResourceBitmap(skbitmap);
 }
 
 }  // namespace cc