gfx: Make conversions from Size to SizeF be explicit.

content/renderer/render_view_impl.cc

 // Copyright (c) 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 "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 3559 matching lines @@
   if (!new_total_scale || zoom_rect.IsEmpty())
     return false;
 
   bool handled = false;
   switch (renderer_preferences_.tap_multiple_targets_strategy) {
     case TAP_MULTIPLE_TARGETS_STRATEGY_ZOOM:
       handled = webview()->zoomToMultipleTargetsRect(zoom_rect);
       break;
     case TAP_MULTIPLE_TARGETS_STRATEGY_POPUP: {
       gfx::Size canvas_size =
-          gfx::ToCeiledSize(gfx::ScaleSize(zoom_rect.size(), new_total_scale));
+          gfx::ScaleToCeiledSize(zoom_rect.size(), new_total_scale);
       cc::SharedBitmapManager* manager =
           RenderThreadImpl::current()->shared_bitmap_manager();
       scoped_ptr<cc::SharedBitmap> shared_bitmap =
           manager->AllocateSharedBitmap(canvas_size);
       CHECK(!!shared_bitmap);
       {
         SkBitmap bitmap;
         SkImageInfo info = SkImageInfo::MakeN32Premul(canvas_size.width(),
                                                       canvas_size.height());
         bitmap.installPixels(info, shared_bitmap->pixels(), info.minRowBytes());
@@ skipping 56 matching lines @@
     OnSetActive(false);
   }
 }
 
 void RenderViewImpl::SetDeviceScaleFactorForTesting(float factor) {
   ViewMsg_Resize_Params params;
   params.screen_info = screen_info_;
   params.screen_info.deviceScaleFactor = factor;
   params.new_size = size();
   params.visible_viewport_size = visible_viewport_size_;
-  params.physical_backing_size =
-      gfx::ToCeiledSize(gfx::ScaleSize(size(), factor));
+  params.physical_backing_size = gfx::ScaleToCeiledSize(size(), factor);
   params.top_controls_shrink_blink_size = false;
   params.top_controls_height = 0.f;
   params.resizer_rect = WebRect();
   params.is_fullscreen_granted = is_fullscreen_granted();
   params.display_mode = display_mode_;
   OnResize(params);
 }
 
 void RenderViewImpl::SetDeviceColorProfileForTesting(
     const std::vector<char>& color_profile) {
@@ skipping 57 matching lines @@
     std::vector<gfx::Size> sizes;
     ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
     if (!url.isEmpty())
       urls.push_back(
           FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content