| 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_H_ | 5 #ifndef UI_GFX_GEOMETRY_POINT_H_ |
| 6 #define UI_GFX_GEOMETRY_POINT_H_ | 6 #define UI_GFX_GEOMETRY_POINT_H_ |
| 7 | 7 |
| 8 #include <iosfwd> | 8 #include <iosfwd> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 } | 77 } |
| 78 | 78 |
| 79 inline Vector2d operator-(const Point& lhs, const Point& rhs) { | 79 inline Vector2d operator-(const Point& lhs, const Point& rhs) { |
| 80 return Vector2d(lhs.x() - rhs.x(), lhs.y() - rhs.y()); | 80 return Vector2d(lhs.x() - rhs.x(), lhs.y() - rhs.y()); |
| 81 } | 81 } |
| 82 | 82 |
| 83 inline Point PointAtOffsetFromOrigin(const Vector2d& offset_from_origin) { | 83 inline Point PointAtOffsetFromOrigin(const Vector2d& offset_from_origin) { |
| 84 return Point(offset_from_origin.x(), offset_from_origin.y()); | 84 return Point(offset_from_origin.x(), offset_from_origin.y()); |
| 85 } | 85 } |
| 86 | 86 |
| 87 #if !defined(COMPILER_MSVC) | 87 #if !defined(COMPILER_MSVC) && !defined(__native_client__) |
| 88 extern template class PointBase<Point, int, Vector2d>; | 88 extern template class PointBase<Point, int, Vector2d>; |
| 89 #endif | 89 #endif |
| 90 | 90 |
| 91 // This is declared here for use in gtest-based unit tests but is defined in | 91 // This is declared here for use in gtest-based unit tests but is defined in |
| 92 // the gfx_test_support target. Depend on that to use this in your unit test. | 92 // the gfx_test_support target. Depend on that to use this in your unit test. |
| 93 // This should not be used in production code - call ToString() instead. | 93 // This should not be used in production code - call ToString() instead. |
| 94 void PrintTo(const Point& point, ::std::ostream* os); | 94 void PrintTo(const Point& point, ::std::ostream* os); |
| 95 | 95 |
| 96 } // namespace gfx | 96 } // namespace gfx |
| 97 | 97 |
| 98 #endif // UI_GFX_GEOMETRY_POINT_H_ | 98 #endif // UI_GFX_GEOMETRY_POINT_H_ |
| OLD | NEW |