| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef UI_GFX_POINT_H_ | 5 #ifndef UI_GFX_POINT_H_ |
| 6 #define UI_GFX_POINT_H_ | 6 #define UI_GFX_POINT_H_ |
| 7 | 7 |
| 8 #include "ui/gfx/gfx_export.h" | 8 #include "ui/gfx/gfx_export.h" |
| 9 #include "ui/gfx/point_base.h" | 9 #include "ui/gfx/point_base.h" |
| 10 #include "ui/gfx/point_f.h" | 10 #include "ui/gfx/point_f.h" |
| 11 #include "ui/gfx/vector2d.h" | 11 #include "ui/gfx/vector2d.h" |
| 12 | 12 |
| 13 #if defined(OS_WIN) | 13 #if defined(OS_WIN) |
| 14 typedef unsigned long DWORD; | 14 typedef unsigned long DWORD; |
| 15 typedef struct tagPOINT POINT; | 15 typedef struct tagPOINT POINT; |
| 16 #elif defined(OS_IOS) | 16 #elif defined(OS_IOS) |
| 17 #include <CoreGraphics/CoreGraphics.h> | 17 #include <CoreGraphics/CoreGraphics.h> |
| 18 #elif defined(OS_MACOSX) | 18 #elif defined(OS_MACOSX) |
| 19 #include <ApplicationServices/ApplicationServices.h> | 19 #include <ApplicationServices/ApplicationServices.h> |
| 20 #endif | 20 #endif |
| 21 | 21 |
| 22 namespace gfx { | 22 namespace gfx { |
| 23 | 23 |
| 24 // A point has an x and y coordinate. | 24 // A point has an x and y coordinate. |
| 25 class UI_EXPORT Point : public PointBase<Point, int, Vector2d> { | 25 class GFX_EXPORT Point : public PointBase<Point, int, Vector2d> { |
| 26 public: | 26 public: |
| 27 Point() : PointBase<Point, int, Vector2d>(0, 0) {} | 27 Point() : PointBase<Point, int, Vector2d>(0, 0) {} |
| 28 Point(int x, int y) : PointBase<Point, int, Vector2d>(x, y) {} | 28 Point(int x, int y) : PointBase<Point, int, Vector2d>(x, y) {} |
| 29 #if defined(OS_WIN) | 29 #if defined(OS_WIN) |
| 30 // |point| is a DWORD value that contains a coordinate. The x-coordinate is | 30 // |point| is a DWORD value that contains a coordinate. The x-coordinate is |
| 31 // the low-order short and the y-coordinate is the high-order short. This | 31 // the low-order short and the y-coordinate is the high-order short. This |
| 32 // value is commonly acquired from GetMessagePos/GetCursorPos. | 32 // value is commonly acquired from GetMessagePos/GetCursorPos. |
| 33 explicit Point(DWORD point); | 33 explicit Point(DWORD point); |
| 34 explicit Point(const POINT& point); | 34 explicit Point(const POINT& point); |
| 35 Point& operator=(const POINT& point); | 35 Point& operator=(const POINT& point); |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 return Point(offset_from_origin.x(), offset_from_origin.y()); | 81 return Point(offset_from_origin.x(), offset_from_origin.y()); |
| 82 } | 82 } |
| 83 | 83 |
| 84 #if !defined(COMPILER_MSVC) | 84 #if !defined(COMPILER_MSVC) |
| 85 extern template class PointBase<Point, int, Vector2d>; | 85 extern template class PointBase<Point, int, Vector2d>; |
| 86 #endif | 86 #endif |
| 87 | 87 |
| 88 } // namespace gfx | 88 } // namespace gfx |
| 89 | 89 |
| 90 #endif // UI_GFX_POINT_H_ | 90 #endif // UI_GFX_POINT_H_ |
| OLD | NEW |