| 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_F_H_ | 5 #ifndef UI_GFX_GEOMETRY_POINT_F_H_ |
| 6 #define UI_GFX_POINT_F_H_ | 6 #define UI_GFX_GEOMETRY_POINT_F_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "ui/gfx/geometry/point_base.h" |
| 11 #include "ui/gfx/geometry/vector2d_f.h" |
| 10 #include "ui/gfx/gfx_export.h" | 12 #include "ui/gfx/gfx_export.h" |
| 11 #include "ui/gfx/point_base.h" | |
| 12 #include "ui/gfx/vector2d_f.h" | |
| 13 | 13 |
| 14 namespace gfx { | 14 namespace gfx { |
| 15 | 15 |
| 16 // A floating version of gfx::Point. | 16 // A floating version of gfx::Point. |
| 17 class GFX_EXPORT PointF : public PointBase<PointF, float, Vector2dF> { | 17 class GFX_EXPORT PointF : public PointBase<PointF, float, Vector2dF> { |
| 18 public: | 18 public: |
| 19 PointF() : PointBase<PointF, float, Vector2dF>(0, 0) {} | 19 PointF() : PointBase<PointF, float, Vector2dF>(0, 0) {} |
| 20 PointF(float x, float y) : PointBase<PointF, float, Vector2dF>(x, y) {} | 20 PointF(float x, float y) : PointBase<PointF, float, Vector2dF>(x, y) {} |
| 21 ~PointF() {} | 21 ~PointF() {} |
| 22 | 22 |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 inline PointF ScalePoint(const PointF& p, float scale) { | 65 inline PointF ScalePoint(const PointF& p, float scale) { |
| 66 return ScalePoint(p, scale, scale); | 66 return ScalePoint(p, scale, scale); |
| 67 } | 67 } |
| 68 | 68 |
| 69 #if !defined(COMPILER_MSVC) | 69 #if !defined(COMPILER_MSVC) |
| 70 extern template class PointBase<PointF, float, Vector2dF>; | 70 extern template class PointBase<PointF, float, Vector2dF>; |
| 71 #endif | 71 #endif |
| 72 | 72 |
| 73 } // namespace gfx | 73 } // namespace gfx |
| 74 | 74 |
| 75 #endif // UI_GFX_POINT_F_H_ | 75 #endif // UI_GFX_GEOMETRY_POINT_F_H_ |
| OLD | NEW |