diff options
Diffstat (limited to 'chromium/ui/gfx/point.h')
-rw-r--r-- | chromium/ui/gfx/point.h | 89 |
1 files changed, 3 insertions, 86 deletions
diff --git a/chromium/ui/gfx/point.h b/chromium/ui/gfx/point.h index 020c4e1251a..bbca081095d 100644 --- a/chromium/ui/gfx/point.h +++ b/chromium/ui/gfx/point.h @@ -1,90 +1,7 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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_ +// TODO(beng): remove once callsites are patched. +#include "ui/gfx/geometry/point.h" -#include "ui/gfx/gfx_export.h" -#include "ui/gfx/point_base.h" -#include "ui/gfx/point_f.h" -#include "ui/gfx/vector2d.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 GFX_EXPORT Point : public PointBase<Point, int, Vector2d> { - public: - Point() : PointBase<Point, int, Vector2d>(0, 0) {} - Point(int x, int y) : PointBase<Point, int, Vector2d>(x, 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() {} - -#if defined(OS_WIN) - POINT ToPOINT() const; -#elif defined(OS_MACOSX) - CGPoint ToCGPoint() const; -#endif - - operator PointF() const { - return PointF(x(), y()); - } - - // Returns a string representation of point. - std::string ToString() const; -}; - -inline bool operator==(const Point& lhs, const Point& rhs) { - return lhs.x() == rhs.x() && lhs.y() == rhs.y(); -} - -inline bool operator!=(const Point& lhs, const Point& rhs) { - return !(lhs == rhs); -} - -inline Point operator+(const Point& lhs, const Vector2d& rhs) { - Point result(lhs); - result += rhs; - return result; -} - -inline Point operator-(const Point& lhs, const Vector2d& rhs) { - Point result(lhs); - result -= rhs; - return result; -} - -inline Vector2d operator-(const Point& lhs, const Point& rhs) { - return Vector2d(lhs.x() - rhs.x(), lhs.y() - rhs.y()); -} - -inline Point PointAtOffsetFromOrigin(const Vector2d& offset_from_origin) { - return Point(offset_from_origin.x(), offset_from_origin.y()); -} - -#if !defined(COMPILER_MSVC) -extern template class PointBase<Point, int, Vector2d>; -#endif - -} // namespace gfx - -#endif // UI_GFX_POINT_H_ |