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

content/browser/renderer_host/backing_store_mac.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "content/browser/renderer_host/backing_store_mac.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/rect.h"
+#include "ui/gfx/size_conversions.h"
 #include "ui/gfx/scoped_cg_context_save_gstate_mac.h"
 #include "ui/surface/transport_dib.h"
 
 namespace {
 
 // Returns a Rect obtained by flooring the values of the given RectF.
 gfx::Rect ToFlooredRect(const gfx::RectF& rect) {
   return gfx::Rect(static_cast<int>(std::floor(rect.x())),
                    static_cast<int>(std::floor(rect.y())),
                    static_cast<int>(std::floor(rect.width())),
@@ skipping 42 matching lines @@
 
   cg_layer_.swap(new_layer);
   if (!cg_layer_) {
     // The view isn't in a window yet.  Use a CGBitmapContext for now.
     cg_bitmap_.reset(CreateCGBitmapContext());
     CGContextScaleCTM(cg_bitmap_, device_scale_factor_, device_scale_factor_);
   }
 }
 
 size_t BackingStoreMac::MemorySize() {
-  return size().Scale(device_scale_factor_).GetArea() * 4;
+  return gfx::ToFlooredSize(size().Scale(device_scale_factor_)).GetArea() * 4;
 }
 
 void BackingStoreMac::PaintToBackingStore(
     RenderProcessHost* process,
     TransportDIB::Id bitmap,
     const gfx::Rect& bitmap_rect,
     const std::vector<gfx::Rect>& copy_rects,
     float scale_factor,
     const base::Closure& completion_callback,
     bool* scheduled_completion_callback) {
   *scheduled_completion_callback = false;
   DCHECK_NE(static_cast<bool>(cg_layer()), static_cast<bool>(cg_bitmap()));
 
   TransportDIB* dib = process->GetTransportDIB(bitmap);
   if (!dib)
     return;
 
-  gfx::Size pixel_size = size().Scale(device_scale_factor_);
+  gfx::Size pixel_size = gfx::ToFlooredSize(
+      size().Scale(device_scale_factor_));
   gfx::Rect pixel_bitmap_rect =
       ToFlooredRect(bitmap_rect.Scale(scale_factor));
 
   size_t bitmap_byte_count =
       pixel_bitmap_rect.width() * pixel_bitmap_rect.height() * 4;
   DCHECK_GE(dib->size(), bitmap_byte_count);
 
   base::mac::ScopedCFTypeRef<CGDataProviderRef> data_provider(
       CGDataProviderCreateWithData(NULL, dib->memory(),
       bitmap_byte_count, NULL));
@@ skipping 149 matching lines @@
   // bitmap backing |layer| with be size().Scale(2) in HiDPI mode automatically.
   CGLayerRef layer = CGLayerCreateWithContext(cg_context,
                                               size().ToCGSize(),
                                               NULL);
   DCHECK(layer);
 
   return layer;
 }
 
 CGContextRef BackingStoreMac::CreateCGBitmapContext() {
-  gfx::Size pixel_size = size().Scale(device_scale_factor_);
+  gfx::Size pixel_size = gfx::ToFlooredSize(size().Scale(device_scale_factor_));
   // A CGBitmapContext serves as a stand-in for the layer before the view is
   // in a containing window.
   CGContextRef context = CGBitmapContextCreate(NULL,
                                                pixel_size.width(),
                                                pixel_size.height(),
                                                8, pixel_size.width() * 4,
                                                base::mac::GetSystemColorSpace(),
                                                kCGImageAlphaPremultipliedFirst |
                                                    kCGBitmapByteOrder32Host);
   DCHECK(context);
 
   return context;
 }
 
 }  // namespace content