gfx: Make conversions from Size to SizeF be explicit.

content/browser/renderer_host/render_widget_host_view_browsertest.cc

 // Copyright (c) 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/barrier_closure.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 826 matching lines @@
 #define MAYBE_CopyToVideoFrame_CenterRegion CopyToVideoFrame_CenterRegion
 #define MAYBE_CopyToVideoFrame_ScaledResult CopyToVideoFrame_ScaledResult
 #endif
 
 IN_PROC_BROWSER_TEST_P(
     CompositingRenderWidgetHostViewBrowserTestTabCaptureHighDPI,
     MAYBE_CopyToBitmap_EntireRegion) {
   gfx::Size html_rect_size(200, 150);
   gfx::Rect copy_rect(200, 150);
   // Scale the output size so that, internally, scaling is not occurring.
-  gfx::Size output_size =
-      gfx::ToRoundedSize(gfx::ScaleSize(copy_rect.size(), scale()));
+  gfx::Size output_size = gfx::ScaleToRoundedSize(copy_rect.size(), scale());
   bool video_frame = false;
   PerformTestWithLeftRightRects(html_rect_size,
                                 copy_rect,
                                 output_size,
                                 video_frame);
 }
 
 IN_PROC_BROWSER_TEST_P(
     CompositingRenderWidgetHostViewBrowserTestTabCaptureHighDPI,
     MAYBE_CopyToBitmap_CenterRegion) {
   gfx::Size html_rect_size(200, 150);
   // Grab 90x60 pixels from the center of the tab contents.
   gfx::Rect copy_rect =
       gfx::Rect(gfx::Rect(html_rect_size).CenterPoint() - gfx::Vector2d(45, 30),
                 gfx::Size(90, 60));
   // Scale the output size so that, internally, scaling is not occurring.
-  gfx::Size output_size =
-      gfx::ToRoundedSize(gfx::ScaleSize(copy_rect.size(), scale()));
+  gfx::Size output_size = gfx::ScaleToRoundedSize(copy_rect.size(), scale());
   bool video_frame = false;
   PerformTestWithLeftRightRects(html_rect_size,
                                 copy_rect,
                                 output_size,
                                 video_frame);
 }
 
 IN_PROC_BROWSER_TEST_P(
     CompositingRenderWidgetHostViewBrowserTestTabCaptureHighDPI,
     MAYBE_CopyToBitmap_ScaledResult) {
   gfx::Size html_rect_size(200, 100);
   gfx::Rect copy_rect(200, 100);
   // Output is being down-scaled since output_size is in phyiscal pixels.
   gfx::Size output_size(200, 100);
   bool video_frame = false;
   PerformTestWithLeftRightRects(html_rect_size,
                                 copy_rect,
                                 output_size,
                                 video_frame);
 }
 
 IN_PROC_BROWSER_TEST_P(
     CompositingRenderWidgetHostViewBrowserTestTabCaptureHighDPI,
     MAYBE_CopyToVideoFrame_EntireRegion) {
   gfx::Size html_rect_size(200, 150);
   gfx::Rect copy_rect(200, 150);
   // Scale the output size so that, internally, scaling is not occurring.
-  gfx::Size output_size =
-      gfx::ToRoundedSize(gfx::ScaleSize(copy_rect.size(), scale()));
+  gfx::Size output_size = gfx::ScaleToRoundedSize(copy_rect.size(), scale());
   bool video_frame = true;
   PerformTestWithLeftRightRects(html_rect_size,
                                 copy_rect,
                                 output_size,
                                 video_frame);
 }
 
 IN_PROC_BROWSER_TEST_P(
     CompositingRenderWidgetHostViewBrowserTestTabCaptureHighDPI,
     MAYBE_CopyToVideoFrame_CenterRegion) {
   gfx::Size html_rect_size(200, 150);
   // Grab 90x60 pixels from the center of the tab contents.
   gfx::Rect copy_rect =
       gfx::Rect(gfx::Rect(html_rect_size).CenterPoint() - gfx::Vector2d(45, 30),
                 gfx::Size(90, 60));
   // Scale the output size so that, internally, scaling is not occurring.
-  gfx::Size output_size =
-      gfx::ToRoundedSize(gfx::ScaleSize(copy_rect.size(), scale()));
+  gfx::Size output_size = gfx::ScaleToRoundedSize(copy_rect.size(), scale());
   bool video_frame = true;
   PerformTestWithLeftRightRects(html_rect_size,
                                 copy_rect,
                                 output_size,
                                 video_frame);
 }
 
 IN_PROC_BROWSER_TEST_P(
     CompositingRenderWidgetHostViewBrowserTestTabCaptureHighDPI,
     MAYBE_CopyToVideoFrame_ScaledResult) {
@@ skipping 24 matching lines @@
                         kTestCompositingModes);
 INSTANTIATE_TEST_CASE_P(
     GLAndSoftwareCompositing,
     CompositingRenderWidgetHostViewBrowserTestTabCaptureHighDPI,
     kTestCompositingModes);
 
 #endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
 
 }  // namespace
 }  // namespace content