Remove implicit flooring Scale() method from Point and Size.

chrome/browser/tab_contents/thumbnail_generator.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 "chrome/browser/tab_contents/thumbnail_generator.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 13 matching lines @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "skia/ext/image_operations.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/layout.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/rect.h"
+#include "ui/gfx/size_conversions.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/scrollbar_size.h"
 #include "ui/gfx/skbitmap_operations.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 // Overview
 // --------
@@ skipping 56 matching lines @@
 // ui::SCALE_FACTOR_200P because the high resolution thumbnail on high density
 // display alleviates the aliasing.
 // TODO(mazda): Copy the pixels with the smaller size in the case of
 // ui::SCALE_FACTOR_100P once the resampling method has been improved.
 gfx::Size GetCopySizeForThumbnail(content::RenderWidgetHostView* view) {
   gfx::Size copy_size(kThumbnailWidth, kThumbnailHeight);
   ui::ScaleFactor scale_factor =
       ui::GetScaleFactorForNativeView(view->GetNativeView());
   switch (scale_factor) {
     case ui::SCALE_FACTOR_100P:
-      copy_size =
-          copy_size.Scale(ui::GetScaleFactorScale(ui::SCALE_FACTOR_200P));
+      copy_size = gfx::ToFlooredSize(
+          copy_size.Scale(ui::GetScaleFactorScale(ui::SCALE_FACTOR_200P)));
       break;
     case ui::SCALE_FACTOR_200P:
       // Use the size as-is.
       break;
     default:
       DLOG(WARNING) << "Unsupported scale factor. Use the same copy size as "
                     << "ui::SCALE_FACTOR_100P";
-      copy_size =
-          copy_size.Scale(ui::GetScaleFactorScale(ui::SCALE_FACTOR_200P));
+      copy_size = gfx::ToFlooredSize(
+          copy_size.Scale(ui::GetScaleFactorScale(ui::SCALE_FACTOR_200P)));
       break;
   }
   return copy_size;
 }
 
 // Returns the size of the thumbnail stored in the database in pixel.
 gfx::Size GetThumbnailSizeInPixel() {
   gfx::Size thumbnail_size(kThumbnailWidth, kThumbnailHeight);
   // Determine the resolution of the thumbnail based on the primary monitor.
   // TODO(oshima): Use device's default scale factor.
   gfx::Display primary_display = gfx::Screen::GetPrimaryDisplay();
-  return thumbnail_size.Scale(primary_display.device_scale_factor());
+  return gfx::ToFlooredSize(
+      thumbnail_size.Scale(primary_display.device_scale_factor()));
 }
 
 // Returns the clipping rectangle that is used for creating a thumbnail with
 // the size of |desired_size| from the bitmap with the size of |source_size|.
 // The type of clipping that needs to be done is assigned to |clip_result|.
 gfx::Rect GetClippingRect(const gfx::Size& source_size,
                           const gfx::Size& desired_size,
                           ThumbnailGenerator::ClipResult* clip_result) {
   DCHECK(clip_result);
 
@@ skipping 161 matching lines @@
 void ThumbnailGenerator::AskForSnapshot(RenderWidgetHost* renderer,
                                         const ThumbnailReadyCallback& callback,
                                         gfx::Size page_size,
                                         gfx::Size desired_size) {
   // We are going to render the thumbnail asynchronously now, so keep
   // this callback for later lookup when the rendering is done.
   static int sequence_num = 0;
   sequence_num++;
   float scale_factor = ui::GetScaleFactorScale(ui::GetScaleFactorForNativeView(
       renderer->GetView()->GetNativeView()));
-  gfx::Size desired_size_in_pixel = desired_size.Scale(scale_factor);
+  gfx::Size desired_size_in_pixel = gfx::ToFlooredSize(
+      desired_size.Scale(scale_factor));
   scoped_ptr<TransportDIB> thumbnail_dib(TransportDIB::Create(
       desired_size_in_pixel.GetArea() * 4, sequence_num));
 
 #if defined(USE_X11)
   // TODO: IPC a handle to the renderer like Windows.
   // http://code.google.com/p/chromium/issues/detail?id=89777
   NOTIMPLEMENTED();
   return;
 #else
 
@@ skipping 312 matching lines @@
 void ThumbnailGenerator::DidStartLoading(
     content::RenderViewHost* render_view_host) {
   load_interrupted_ = false;
 }
 
 void ThumbnailGenerator::StopNavigation() {
   // This function gets called when the page loading is interrupted by the
   // stop button.
   load_interrupted_ = true;
 }