| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_SCROLL_OFFSET_H_ | 5 #ifndef UI_GFX_GEOMETRY_SCROLL_OFFSET_H_ |
| 6 #define UI_GFX_GEOMETRY_SCROLL_OFFSET_H_ | 6 #define UI_GFX_GEOMETRY_SCROLL_OFFSET_H_ |
| 7 | 7 |
| 8 #include <iosfwd> | 8 #include <iosfwd> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 return Vector2dF(v.x(), v.y()); | 109 return Vector2dF(v.x(), v.y()); |
| 110 } | 110 } |
| 111 | 111 |
| 112 inline ScrollOffset ScrollOffsetWithDelta(const ScrollOffset& offset, | 112 inline ScrollOffset ScrollOffsetWithDelta(const ScrollOffset& offset, |
| 113 const Vector2dF& delta) { | 113 const Vector2dF& delta) { |
| 114 return ScrollOffset(offset.x() + delta.x(), | 114 return ScrollOffset(offset.x() + delta.x(), |
| 115 offset.y() + delta.y()); | 115 offset.y() + delta.y()); |
| 116 } | 116 } |
| 117 | 117 |
| 118 // This is declared here for use in gtest-based unit tests but is defined in | 118 // This is declared here for use in gtest-based unit tests but is defined in |
| 119 // the gfx_test_support target. Depend on that to use this in your unit test. | 119 // the //ui/gfx:test_support target. Depend on that to use this in your unit |
| 120 // This should not be used in production code - call ToString() instead. | 120 // test. This should not be used in production code - call ToString() instead. |
| 121 void PrintTo(const ScrollOffset& scroll_offset, ::std::ostream* os); | 121 void PrintTo(const ScrollOffset& scroll_offset, ::std::ostream* os); |
| 122 | 122 |
| 123 } // namespace gfx | 123 } // namespace gfx |
| 124 | 124 |
| 125 #endif // UI_GFX_GEOMETRY_SCROLL_OFFSET_H_ | 125 #endif // UI_GFX_GEOMETRY_SCROLL_OFFSET_H_ |
| OLD | NEW |