Handle large rects better.

ui/gfx/geometry/rect_conversions.cc

Index: ui/gfx/geometry/rect_conversions.cc
diff --git a/ui/gfx/geometry/rect_conversions.cc b/ui/gfx/geometry/rect_conversions.cc
index cc92c57f948b145bfa54165ce16e9e490f488411..c9e006622b02bd10cdc514d5ea16bcc06d709138 100644
--- a/ui/gfx/geometry/rect_conversions.cc
+++ b/ui/gfx/geometry/rect_conversions.cc
@@ -12,31 +12,22 @@
 
 namespace gfx {
 
-Rect ToEnclosingRect(const RectF& rect) {
-  int min_x = ToFlooredInt(rect.x());
-  int min_y = ToFlooredInt(rect.y());
-  float max_x = rect.right();
-  float max_y = rect.bottom();
-  int width = rect.width()
-                  ? ToCeiledInt(static_cast<double>(ToCeiledInt(max_x)) - min_x)
-                  : 0;
-  int height =
-      rect.height()
-          ? ToCeiledInt(static_cast<double>(ToCeiledInt(max_y)) - min_y)
-          : 0;
-  return Rect(min_x, min_y, width, height);
+Rect ToEnclosingRect(const RectF& r) {
+  int left = ToFlooredInt(r.x());
+  int right = r.size().width() ? ToCeiledInt(r.right()) : left;

[danakj, 2017/03/28 20:40:35]

r.width()

[Peter Mayo, 2017/03/29 18:49:26]

Done.

+  int top = ToFlooredInt(r.y());
+  int bottom = r.size().height() ? ToCeiledInt(r.bottom()) : top;

[danakj, 2017/03/28 20:40:35]

r.height()

[Peter Mayo, 2017/03/29 18:49:26]

Done.

+
+  Rect result;
+  result.SetByBounds(left, right, top, bottom);
+  return result;
 }
 
 Rect ToEnclosedRect(const RectF& rect) {
-  int min_x = ToCeiledInt(rect.x());
-  int min_y = ToCeiledInt(rect.y());
-  float max_x = rect.right();
-  float max_y = rect.bottom();
-  int width = std::max(
-      ToFlooredInt(static_cast<float>(ToFlooredInt(max_x)) - min_x), 0);
-  int height = std::max(
-      ToFlooredInt(static_cast<float>(ToFlooredInt(max_y)) - min_y), 0);
-  return Rect(min_x, min_y, width, height);
+  Rect result;
+  result.SetByBounds(ToCeiledInt(rect.x()), ToFlooredInt(rect.right()),
+                     ToCeiledInt(rect.y()), ToFlooredInt(rect.bottom()));
+  return result;
 }
 
 Rect ToNearestRect(const RectF& rect) {
@@ -57,7 +48,10 @@ Rect ToNearestRect(const RectF& rect) {
   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 result;
+  result.SetByBounds(min_x, max_x, min_y, max_y);
+
+  return result;
 }
 
 bool IsNearestRectWithinDistance(const gfx::RectF& rect, float distance) {