Remove some implicit Point to PointF conversions, add helpers.

ui/gfx/geometry/point.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/geometry/point.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #elif defined(OS_IOS)
 #include <CoreGraphics/CoreGraphics.h>
 #elif defined(OS_MACOSX)
 #include <ApplicationServices/ApplicationServices.h>
 #endif
 
 #include "base/strings/stringprintf.h"
+#include "ui/gfx/geometry/point_conversions.h"
 
 namespace gfx {
 
 #if defined(OS_WIN)
 Point::Point(DWORD point) {
   POINTS points = MAKEPOINTS(point);
   x_ = points.x;
   y_ = points.y;
 }
 
@@ skipping 30 matching lines @@
 
 void Point::SetToMax(const Point& other) {
   x_ = x_ >= other.x_ ? x_ : other.x_;
   y_ = y_ >= other.y_ ? y_ : other.y_;
 }
 
 std::string Point::ToString() const {
   return base::StringPrintf("%d,%d", x(), y());
 }
 
+Point ScaleToCeiledPoint(const Point& point, float x_scale, float y_scale) {
+  if (x_scale == 1.f && y_scale == 1.f)
+    return point;
+  return ToCeiledPoint(ScalePoint(gfx::PointF(point), x_scale, y_scale));
+}
+
+Point ScaleToCeiledPoint(const Point& point, float scale) {

[sky, 2015/10/21 16:45:00]

WDYT of inlining the single float variants? For example, in the header having
this as :
return ScaleToCeieldPoint(point, scale, scale);
?

[danakj, 2015/10/21 17:55:40]

I would but they require the PointF definition then, and the point_f.h header
already includes the point.h header for the explicit constructor. So you'd get
circular includes. I could put them in another file.. or something. wdyt?
size.h/cc did it this way. rect.h did it inline cuz it didn't convert to a
RectF.

+  if (scale == 1.f)
+    return point;
+  return ToCeiledPoint(ScalePoint(gfx::PointF(point), scale, scale));
+}
+
+Point ScaleToFlooredPoint(const Point& point, float x_scale, float y_scale) {
+  if (x_scale == 1.f && y_scale == 1.f)
+    return point;
+  return ToFlooredPoint(ScalePoint(gfx::PointF(point), x_scale, y_scale));
+}
+
+Point ScaleToFlooredPoint(const Point& point, float scale) {
+  if (scale == 1.f)
+    return point;
+  return ToFlooredPoint(ScalePoint(gfx::PointF(point), scale, scale));
+}
+
+Point ScaleToRoundedPoint(const Point& point, float x_scale, float y_scale) {
+  if (x_scale == 1.f && y_scale == 1.f)
+    return point;
+  return ToRoundedPoint(ScalePoint(gfx::PointF(point), x_scale, y_scale));
+}
+
+Point ScaleToRoundedPoint(const Point& point, float scale) {
+  if (scale == 1.f)
+    return point;
+  return ToRoundedPoint(ScalePoint(gfx::PointF(point), scale, scale));
+}
+
 }  // namespace gfx