| 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_POINT_F_H_ |
| 6 #define UI_GFX_POINT_F_H_ | 6 #define UI_GFX_POINT_F_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "ui/base/ui_export.h" | 10 #include "ui/base/ui_export.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 } | 24 } |
| 25 | 25 |
| 26 PointF Scale(float x_scale, float y_scale) const WARN_UNUSED_RESULT { | 26 PointF Scale(float x_scale, float y_scale) const WARN_UNUSED_RESULT { |
| 27 return PointF(x() * x_scale, y() * y_scale); | 27 return PointF(x() * x_scale, y() * y_scale); |
| 28 } | 28 } |
| 29 | 29 |
| 30 // Returns a string representation of point. | 30 // Returns a string representation of point. |
| 31 std::string ToString() const; | 31 std::string ToString() const; |
| 32 }; | 32 }; |
| 33 | 33 |
| 34 inline bool operator==(const PointF& lhs, const PointF& rhs) { |
| 35 return lhs.x() == rhs.x() && lhs.y() == rhs.y(); |
| 36 } |
| 37 |
| 38 inline bool operator!=(const PointF& lhs, const PointF& rhs) { |
| 39 return !(lhs == rhs); |
| 40 } |
| 41 |
| 34 inline PointF operator+(PointF lhs, PointF rhs) { | 42 inline PointF operator+(PointF lhs, PointF rhs) { |
| 35 return lhs.Add(rhs); | 43 return lhs.Add(rhs); |
| 36 } | 44 } |
| 37 | 45 |
| 38 inline PointF operator-(PointF lhs, PointF rhs) { | 46 inline PointF operator-(PointF lhs, PointF rhs) { |
| 39 return lhs.Subtract(rhs); | 47 return lhs.Subtract(rhs); |
| 40 } | 48 } |
| 41 | 49 |
| 42 #if !defined(COMPILER_MSVC) | 50 #if !defined(COMPILER_MSVC) |
| 43 extern template class PointBase<PointF, float>; | 51 extern template class PointBase<PointF, float>; |
| 44 #endif | 52 #endif |
| 45 | 53 |
| 46 } // namespace gfx | 54 } // namespace gfx |
| 47 | 55 |
| 48 #endif // UI_GFX_POINT_F_H_ | 56 #endif // UI_GFX_POINT_F_H_ |
| OLD | NEW |