Remove some implicit Point to PointF conversions, add helpers.

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 <algorithm>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 141 matching lines @@
   Insets insets = bounds_.InsetsFrom(work_area_);
   if (!HasForceDeviceScaleFactor()) {
 #if defined(OS_MACOSX)
     // Unless an explicit scale factor was provided for testing, ensure the
     // scale is integral.
     device_scale_factor = static_cast<int>(device_scale_factor);
 #endif
     device_scale_factor_ = device_scale_factor;
   }
   device_scale_factor_ = std::max(1.0f, device_scale_factor_);
-  bounds_ =
-      gfx::Rect(gfx::ToFlooredPoint(gfx::ScalePoint(
-                    bounds_in_pixel.origin(), 1.0f / device_scale_factor_)),
-                gfx::ScaleToFlooredSize(bounds_in_pixel.size(),
-                                        1.0f / device_scale_factor_));
+  bounds_ = gfx::Rect(gfx::ScaleToFlooredPoint(bounds_in_pixel.origin(),
+                                               1.0f / device_scale_factor_),
+                      gfx::ScaleToFlooredSize(bounds_in_pixel.size(),
+                                              1.0f / device_scale_factor_));
   UpdateWorkAreaFromInsets(insets);
 }
 
 void Display::SetSize(const gfx::Size& size_in_pixel) {
   gfx::Point origin = bounds_.origin();
 #if defined(USE_AURA)
-  gfx::PointF origin_f = origin;
-  origin_f.Scale(device_scale_factor_);
-  origin = gfx::ToFlooredPoint(origin_f);
+  origin = gfx::ScaleToFlooredPoint(origin, device_scale_factor_);
 #endif
   SetScaleAndBounds(device_scale_factor_, gfx::Rect(origin, size_in_pixel));
 }
 
 void Display::UpdateWorkAreaFromInsets(const gfx::Insets& insets) {
   work_area_ = bounds_;
   work_area_.Inset(insets);
 }
 
 gfx::Size Display::GetSizeInPixel() const {
@@ skipping 30 matching lines @@
   DCHECK_NE(kInvalidDisplayID, display_id);
   return HasInternalDisplay() && internal_display_id_ == display_id;
 }
 
 // static
 bool Display::HasInternalDisplay() {
   return internal_display_id_ != kInvalidDisplayID;
 }
 
 }  // namespace gfx