| Index: gfx/point.h
|
| ===================================================================
|
| --- gfx/point.h (revision 73487)
|
| +++ gfx/point.h (working copy)
|
| @@ -6,96 +6,7 @@
|
| #define GFX_POINT_H_
|
| #pragma once
|
|
|
| -#include "build/build_config.h"
|
| +#include "ui/gfx/point.h"
|
| +// TODO(sail): remove this file once all includes have been updated.
|
|
|
| -#include <iosfwd>
|
| -
|
| -#if defined(OS_WIN)
|
| -typedef unsigned long DWORD;
|
| -typedef struct tagPOINT POINT;
|
| -#elif defined(OS_MACOSX)
|
| -#include <ApplicationServices/ApplicationServices.h>
|
| -#endif
|
| -
|
| -namespace gfx {
|
| -
|
| -// A point has an x and y coordinate.
|
| -class Point {
|
| - public:
|
| - Point();
|
| - Point(int x, int y);
|
| -#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() {}
|
| -
|
| - int x() const { return x_; }
|
| - int y() const { return y_; }
|
| -
|
| - void SetPoint(int x, int y) {
|
| - x_ = x;
|
| - y_ = y;
|
| - }
|
| -
|
| - void set_x(int x) { x_ = x; }
|
| - void set_y(int y) { y_ = y; }
|
| -
|
| - void Offset(int delta_x, int delta_y) {
|
| - x_ += delta_x;
|
| - y_ += delta_y;
|
| - }
|
| -
|
| - Point Add(const Point& other) const{
|
| - Point copy = *this;
|
| - copy.Offset(other.x_, other.y_);
|
| - return copy;
|
| - }
|
| -
|
| - Point Subtract(const Point& other) const {
|
| - Point copy = *this;
|
| - copy.Offset(-other.x_, -other.y_);
|
| - return copy;
|
| - }
|
| -
|
| - bool operator==(const Point& rhs) const {
|
| - return x_ == rhs.x_ && y_ == rhs.y_;
|
| - }
|
| -
|
| - bool operator!=(const Point& rhs) const {
|
| - return !(*this == rhs);
|
| - }
|
| -
|
| - // A point is less than another point if its y-value is closer
|
| - // to the origin. If the y-values are the same, then point with
|
| - // the x-value closer to the origin is considered less than the
|
| - // other.
|
| - // This comparison is required to use Points in sets, or sorted
|
| - // vectors.
|
| - bool operator<(const Point& rhs) const {
|
| - return (y_ == rhs.y_) ? (x_ < rhs.x_) : (y_ < rhs.y_);
|
| - }
|
| -
|
| -#if defined(OS_WIN)
|
| - POINT ToPOINT() const;
|
| -#elif defined(OS_MACOSX)
|
| - CGPoint ToCGPoint() const;
|
| -#endif
|
| -
|
| - private:
|
| - int x_;
|
| - int y_;
|
| -};
|
| -
|
| -std::ostream& operator<<(std::ostream& out, const gfx::Point& p);
|
| -
|
| -} // namespace gfx
|
| -
|
| #endif // GFX_POINT_H_
|
|
|