Index: ui/gfx/rect_conversions.cc |
diff --git a/ui/gfx/rect_conversions.cc b/ui/gfx/rect_conversions.cc |
index 160c547a737c9d8ec5f1d8dd6f25dda6dcc2edd6..c0391b3d03953d1d1a5817752f73054d35eaff66 100644 |
--- a/ui/gfx/rect_conversions.cc |
+++ b/ui/gfx/rect_conversions.cc |
@@ -4,6 +4,9 @@ |
#include "ui/gfx/rect_conversions.h" |
+#include <cmath> |
+ |
+#include "base/logging.h" |
#include "ui/gfx/safe_integer_conversions.h" |
namespace gfx { |
@@ -28,6 +31,27 @@ Rect ToEnclosedRect(const RectF& rect) { |
return Rect(min_x, min_y, width, height); |
} |
+Rect ToNearestRect(const RectF& rect) { |
+ float float_min_x = rect.origin().x(); |
+ float float_min_y = rect.origin().y(); |
+ float float_max_x = float_min_x + rect.size().width(); |
+ float float_max_y = float_min_y + rect.size().height(); |
+ |
+ int min_x = ToRoundedInt(float_min_x); |
+ int min_y = ToRoundedInt(float_min_y); |
+ int max_x = ToRoundedInt(float_max_x); |
+ int max_y = ToRoundedInt(float_max_y); |
+ |
+ // If these DCHECKs fail, you're using the wrong method, consider using |
+ // ToEnclosingRect or ToEnclosedRect instead. |
+ DCHECK(std::abs(min_x - float_min_x) < 0.01f); |
+ DCHECK(std::abs(min_y - float_min_y) < 0.01f); |
+ DCHECK(std::abs(max_x - float_max_x) < 0.01f); |
+ DCHECK(std::abs(max_y - float_max_y) < 0.01f); |
+ |
+ return Rect(min_x, min_y, max_x - min_x, max_y - min_y); |
+} |
+ |
Rect ToFlooredRectDeprecated(const RectF& rect) { |
return Rect(ToFlooredInt(rect.origin().x()), |
ToFlooredInt(rect.origin().y()), |