| 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_RECT_F_H_ | 5 #ifndef UI_GFX_RECT_F_H_ |
| 6 #define UI_GFX_RECT_F_H_ | 6 #define UI_GFX_RECT_F_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "ui/gfx/point_f.h" | 10 #include "ui/gfx/point_f.h" |
| 11 #include "ui/gfx/rect_base.h" | 11 #include "ui/gfx/rect_base.h" |
| 12 #include "ui/gfx/size_f.h" | 12 #include "ui/gfx/size_f.h" |
| 13 | 13 |
| 14 namespace gfx { | 14 namespace gfx { |
| 15 | 15 |
| 16 class InsetsF; | 16 class InsetsF; |
| 17 | 17 |
| 18 // A floating version of gfx::Rect. | 18 // A floating version of gfx::Rect. |
| 19 class UI_EXPORT RectF : public RectBase<RectF, PointF, SizeF, InsetsF, float> { | 19 class UI_EXPORT RectF |
| 20 : public RectBase<RectF, PointF, SizeF, InsetsF, Vector2dF, float> { |
| 20 public: | 21 public: |
| 21 RectF(); | 22 RectF(); |
| 22 RectF(float width, float height); | 23 RectF(float width, float height); |
| 23 RectF(float x, float y, float width, float height); | 24 RectF(float x, float y, float width, float height); |
| 24 explicit RectF(const gfx::SizeF& size); | 25 explicit RectF(const gfx::SizeF& size); |
| 25 RectF(const gfx::PointF& origin, const gfx::SizeF& size); | 26 RectF(const gfx::PointF& origin, const gfx::SizeF& size); |
| 26 | 27 |
| 27 ~RectF(); | 28 ~RectF(); |
| 28 | 29 |
| 29 /// Scales the rectangle by |scale|. | 30 /// Scales the rectangle by |scale|. |
| (...skipping 13 matching lines...) Expand all Loading... |
| 43 | 44 |
| 44 inline bool operator==(const RectF& lhs, const RectF& rhs) { | 45 inline bool operator==(const RectF& lhs, const RectF& rhs) { |
| 45 return lhs.origin() == rhs.origin() && lhs.size() == rhs.size(); | 46 return lhs.origin() == rhs.origin() && lhs.size() == rhs.size(); |
| 46 } | 47 } |
| 47 | 48 |
| 48 inline bool operator!=(const RectF& lhs, const RectF& rhs) { | 49 inline bool operator!=(const RectF& lhs, const RectF& rhs) { |
| 49 return !(lhs == rhs); | 50 return !(lhs == rhs); |
| 50 } | 51 } |
| 51 | 52 |
| 52 #if !defined(COMPILER_MSVC) | 53 #if !defined(COMPILER_MSVC) |
| 53 extern template class RectBase<RectF, PointF, SizeF, InsetsF, float>; | 54 extern template class RectBase<RectF, PointF, SizeF, InsetsF, Vector2dF, float>; |
| 54 #endif | 55 #endif |
| 55 | 56 |
| 56 } // namespace gfx | 57 } // namespace gfx |
| 57 | 58 |
| 58 #endif // UI_GFX_RECT_F_H_ | 59 #endif // UI_GFX_RECT_F_H_ |
| OLD | NEW |