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

ui/gfx/display.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 "ui/gfx/display.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/insets.h"
+#include "ui/gfx/size_conversions.h"
 
 namespace gfx {
 namespace {
 
 bool HasForceDeviceScaleFactor() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kForceDeviceScaleFactor);
 }
 
 float GetForcedDeviceScaleFactorImpl() {
@@ skipping 57 matching lines @@
 
 void Display::SetScaleAndBounds(
     float device_scale_factor,
     const gfx::Rect& bounds_in_pixel) {
   Insets insets = bounds_.InsetsFrom(work_area_);
   if (!HasForceDeviceScaleFactor())
     device_scale_factor_ = device_scale_factor;
 #if defined(USE_AURA)
   bounds_in_pixel_ = bounds_in_pixel;
 #endif
-  bounds_ = gfx::Rect(
-      bounds_in_pixel.size().Scale(1.0f / device_scale_factor_));
+  bounds_ = gfx::Rect(gfx::ToFlooredSize(
+      bounds_in_pixel.size().Scale(1.0f / device_scale_factor_)));
   UpdateWorkAreaFromInsets(insets);
 }
 
 void Display::SetSize(const gfx::Size& size_in_pixel) {
   SetScaleAndBounds(
       device_scale_factor_,
 #if defined(USE_AURA)
       gfx::Rect(bounds_in_pixel_.origin(), size_in_pixel));
 #else
       gfx::Rect(bounds_.origin(), size_in_pixel));
 #endif
 }
 
 void Display::UpdateWorkAreaFromInsets(const gfx::Insets& insets) {
   work_area_ = bounds_;
   work_area_.Inset(insets);
 }
 
 gfx::Size Display::GetSizeInPixel() const {
-  return size().Scale(device_scale_factor_);
+  return gfx::ToFlooredSize(size().Scale(device_scale_factor_));
 }
 
 std::string Display::ToString() const {
   return base::StringPrintf("Display[%lld] bounds=%s, workarea=%s, scale=%f",
                             static_cast<long long int>(id_),
                             bounds_.ToString().c_str(),
                             work_area_.ToString().c_str(),
                             device_scale_factor_);
 }
 
 }  // namespace gfx