| 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 #include "ui/gfx/rect_f.h" | 5 #include "ui/gfx/geometry/rect_f.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
| 11 #include "ui/gfx/insets_f.h" | 11 #include "ui/gfx/geometry/insets_f.h" |
| 12 #include "ui/gfx/rect_base_impl.h" | 12 #include "ui/gfx/geometry/rect_base_impl.h" |
| 13 #include "ui/gfx/safe_integer_conversions.h" | 13 #include "ui/gfx/geometry/safe_integer_conversions.h" |
| 14 | 14 |
| 15 namespace gfx { | 15 namespace gfx { |
| 16 | 16 |
| 17 template class RectBase<RectF, PointF, SizeF, InsetsF, Vector2dF, float>; | 17 template class RectBase<RectF, PointF, SizeF, InsetsF, Vector2dF, float>; |
| 18 | 18 |
| 19 typedef class RectBase<RectF, PointF, SizeF, InsetsF, Vector2dF, | 19 typedef class RectBase<RectF, PointF, SizeF, InsetsF, Vector2dF, |
| 20 float> RectBaseT; | 20 float> RectBaseT; |
| 21 | 21 |
| 22 bool RectF::IsExpressibleAsRect() const { | 22 bool RectF::IsExpressibleAsRect() const { |
| 23 return IsExpressibleAsInt(x()) && IsExpressibleAsInt(y()) && | 23 return IsExpressibleAsInt(x()) && IsExpressibleAsInt(y()) && |
| (...skipping 27 matching lines...) Expand all Loading... |
| 51 | 51 |
| 52 RectF BoundingRect(const PointF& p1, const PointF& p2) { | 52 RectF BoundingRect(const PointF& p1, const PointF& p2) { |
| 53 float rx = std::min(p1.x(), p2.x()); | 53 float rx = std::min(p1.x(), p2.x()); |
| 54 float ry = std::min(p1.y(), p2.y()); | 54 float ry = std::min(p1.y(), p2.y()); |
| 55 float rr = std::max(p1.x(), p2.x()); | 55 float rr = std::max(p1.x(), p2.x()); |
| 56 float rb = std::max(p1.y(), p2.y()); | 56 float rb = std::max(p1.y(), p2.y()); |
| 57 return RectF(rx, ry, rr - rx, rb - ry); | 57 return RectF(rx, ry, rr - rx, rb - ry); |
| 58 } | 58 } |
| 59 | 59 |
| 60 } // namespace gfx | 60 } // namespace gfx |
| OLD | NEW |