| 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_GEOMETRY_RECT_F_H_ |
| 6 #define UI_GFX_RECT_F_H_ | 6 #define UI_GFX_GEOMETRY_RECT_F_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "ui/gfx/point_f.h" | 10 #include "ui/gfx/geometry/point_f.h" |
| 11 #include "ui/gfx/rect_base.h" | 11 #include "ui/gfx/geometry/rect_base.h" |
| 12 #include "ui/gfx/size_f.h" | 12 #include "ui/gfx/geometry/size_f.h" |
| 13 #include "ui/gfx/vector2d_f.h" | 13 #include "ui/gfx/geometry/vector2d_f.h" |
| 14 | 14 |
| 15 namespace gfx { | 15 namespace gfx { |
| 16 | 16 |
| 17 class InsetsF; | 17 class InsetsF; |
| 18 | 18 |
| 19 // A floating version of gfx::Rect. | 19 // A floating version of gfx::Rect. |
| 20 class GFX_EXPORT RectF | 20 class GFX_EXPORT RectF |
| 21 : public RectBase<RectF, PointF, SizeF, InsetsF, Vector2dF, float> { | 21 : public RectBase<RectF, PointF, SizeF, InsetsF, Vector2dF, float> { |
| 22 public: | 22 public: |
| 23 RectF() | 23 RectF() |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 // rect to be outside the rect. So technically one or both points will not be | 103 // rect to be outside the rect. So technically one or both points will not be |
| 104 // contained within the rect, because they will appear on one of these edges. | 104 // contained within the rect, because they will appear on one of these edges. |
| 105 GFX_EXPORT RectF BoundingRect(const PointF& p1, const PointF& p2); | 105 GFX_EXPORT RectF BoundingRect(const PointF& p1, const PointF& p2); |
| 106 | 106 |
| 107 #if !defined(COMPILER_MSVC) | 107 #if !defined(COMPILER_MSVC) |
| 108 extern template class RectBase<RectF, PointF, SizeF, InsetsF, Vector2dF, float>; | 108 extern template class RectBase<RectF, PointF, SizeF, InsetsF, Vector2dF, float>; |
| 109 #endif | 109 #endif |
| 110 | 110 |
| 111 } // namespace gfx | 111 } // namespace gfx |
| 112 | 112 |
| 113 #endif // UI_GFX_RECT_F_H_ | 113 #endif // UI_GFX_GEOMETRY_RECT_F_H_ |
| OLD | NEW |