| 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_GEOMETRY_POINT_F_H_ | 5 #ifndef UI_GFX_GEOMETRY_POINT_F_H_ |
| 6 #define UI_GFX_GEOMETRY_POINT_F_H_ | 6 #define UI_GFX_GEOMETRY_POINT_F_H_ |
| 7 | 7 |
| 8 #include <iosfwd> |
| 8 #include <string> | 9 #include <string> |
| 9 | 10 |
| 10 #include "ui/gfx/geometry/point_base.h" | 11 #include "ui/gfx/geometry/point_base.h" |
| 11 #include "ui/gfx/geometry/vector2d_f.h" | 12 #include "ui/gfx/geometry/vector2d_f.h" |
| 12 #include "ui/gfx/gfx_export.h" | 13 #include "ui/gfx/gfx_export.h" |
| 13 | 14 |
| 14 namespace gfx { | 15 namespace gfx { |
| 15 | 16 |
| 16 // A floating version of gfx::Point. | 17 // A floating version of gfx::Point. |
| 17 class GFX_EXPORT PointF : public PointBase<PointF, float, Vector2dF> { | 18 class GFX_EXPORT PointF : public PointBase<PointF, float, Vector2dF> { |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 GFX_EXPORT PointF ScalePoint(const PointF& p, float x_scale, float y_scale); | 64 GFX_EXPORT PointF ScalePoint(const PointF& p, float x_scale, float y_scale); |
| 64 | 65 |
| 65 inline PointF ScalePoint(const PointF& p, float scale) { | 66 inline PointF ScalePoint(const PointF& p, float scale) { |
| 66 return ScalePoint(p, scale, scale); | 67 return ScalePoint(p, scale, scale); |
| 67 } | 68 } |
| 68 | 69 |
| 69 #if !defined(COMPILER_MSVC) | 70 #if !defined(COMPILER_MSVC) |
| 70 extern template class PointBase<PointF, float, Vector2dF>; | 71 extern template class PointBase<PointF, float, Vector2dF>; |
| 71 #endif | 72 #endif |
| 72 | 73 |
| 74 // This is declared here for use in gtest-based unit tests but is defined in |
| 75 // the gfx_test_support target. Depend on that to use this in your unit test. |
| 76 // This should not be used in production code - call ToString() instead. |
| 77 void PrintTo(const PointF& point, ::std::ostream* os); |
| 78 |
| 73 } // namespace gfx | 79 } // namespace gfx |
| 74 | 80 |
| 75 #endif // UI_GFX_GEOMETRY_POINT_F_H_ | 81 #endif // UI_GFX_GEOMETRY_POINT_F_H_ |
| OLD | NEW |