Make adding and subtracting gfx:: point types simpler.

ui/gfx/point.h

 // 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.
 
 #ifndef UI_GFX_POINT_H_
 #define UI_GFX_POINT_H_
 
 #include "ui/base/ui_export.h"
 #include "ui/gfx/point_base.h"
+#include "ui/gfx/point_f.h"
 
 #if defined(OS_WIN)
 typedef unsigned long DWORD;
 typedef struct tagPOINT POINT;
 #elif defined(OS_IOS)
 #include <CoreGraphics/CoreGraphics.h>
 #elif defined(OS_MACOSX)
 #include <ApplicationServices/ApplicationServices.h>
 #endif
 
 namespace gfx {
 
 // A point has an x and y coordinate.
 class UI_EXPORT Point : public PointBase<Point, int> {
  public:
   Point();
   Point(int x, int y);
+  Point(const Point& other);

[sky, 2012/09/28 23:05:49]

explicit

[danakj, 2012/09/28 23:19:14]

thanks. i was able to remove the copy constructors once i removed the undefined
PointF(Point) constructor, so these are gone.

 #if defined(OS_WIN)
   // |point| is a DWORD value that contains a coordinate.  The x-coordinate is
   // the low-order short and the y-coordinate is the high-order short.  This
   // value is commonly acquired from GetMessagePos/GetCursorPos.
   explicit Point(DWORD point);
   explicit Point(const POINT& point);
   Point& operator=(const POINT& point);
 #elif defined(OS_MACOSX)
   explicit Point(const CGPoint& point);
 #endif
 
   ~Point() {}
 
 #if defined(OS_WIN)
   POINT ToPOINT() const;
 #elif defined(OS_MACOSX)
   CGPoint ToCGPoint() const;
 #endif
 
   // Returns a string representation of point.
   std::string ToString() const;
+
+  operator PointF() const WARN_UNUSED_RESULT {

[sky, 2012/09/28 23:05:49]

Why the WARN_UNUSED_RESULT?

[danakj, 2012/09/28 23:19:14]

removed.

+    return PointF(x(), y());
+  }
 };
 
+inline Point operator+(Point lhs, Point rhs) {
+  return lhs.Add(rhs);
+}
+
+inline Point operator-(Point lhs, Point rhs) {
+  return lhs.Subtract(rhs);
+}
+
 #if !defined(COMPILER_MSVC)
 extern template class PointBase<Point, int>;
 #endif
 
 }  // namespace gfx
 
 #endif  // UI_GFX_POINT_H_