| 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 // Defines a simple integer vector class. This class is used to indicate a | 5 // Defines a simple integer vector class. This class is used to indicate a |
| 6 // distance in two dimensions between two points. Subtracting two points should | 6 // distance in two dimensions between two points. Subtracting two points should |
| 7 // produce a vector, and adding a vector to a point produces the point at the | 7 // produce a vector, and adding a vector to a point produces the point at the |
| 8 // vector's distance from the original point. | 8 // vector's distance from the original point. |
| 9 | 9 |
| 10 #ifndef UI_GFX_GEOMETRY_VECTOR2D_H_ | 10 #ifndef UI_GFX_GEOMETRY_VECTOR2D_H_ |
| 11 #define UI_GFX_GEOMETRY_VECTOR2D_H_ | 11 #define UI_GFX_GEOMETRY_VECTOR2D_H_ |
| 12 | 12 |
| 13 #include <iosfwd> |
| 13 #include <string> | 14 #include <string> |
| 14 | 15 |
| 15 #include "base/basictypes.h" | 16 #include "base/basictypes.h" |
| 16 #include "ui/gfx/geometry/vector2d_f.h" | 17 #include "ui/gfx/geometry/vector2d_f.h" |
| 17 #include "ui/gfx/gfx_export.h" | 18 #include "ui/gfx/gfx_export.h" |
| 18 | 19 |
| 19 namespace gfx { | 20 namespace gfx { |
| 20 | 21 |
| 21 class GFX_EXPORT Vector2d { | 22 class GFX_EXPORT Vector2d { |
| 22 public: | 23 public: |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 result.Add(rhs); | 80 result.Add(rhs); |
| 80 return result; | 81 return result; |
| 81 } | 82 } |
| 82 | 83 |
| 83 inline Vector2d operator-(const Vector2d& lhs, const Vector2d& rhs) { | 84 inline Vector2d operator-(const Vector2d& lhs, const Vector2d& rhs) { |
| 84 Vector2d result = lhs; | 85 Vector2d result = lhs; |
| 85 result.Add(-rhs); | 86 result.Add(-rhs); |
| 86 return result; | 87 return result; |
| 87 } | 88 } |
| 88 | 89 |
| 90 // This is declared here for use in gtest-based unit tests but is defined in |
| 91 // the gfx_test_support target. Depend on that to use this in your unit test. |
| 92 // This should not be used in production code - call ToString() instead. |
| 93 void PrintTo(const Vector2d& vector, ::std::ostream* os); |
| 94 |
| 89 } // namespace gfx | 95 } // namespace gfx |
| 90 | 96 |
| 91 #endif // UI_GFX_GEOMETRY_VECTOR2D_H_ | 97 #endif // UI_GFX_GEOMETRY_VECTOR2D_H_ |
| OLD | NEW |