gfx: Fix ToEnclosing/ToEnclosed math to deal with big numbers.

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 cceeb83a0ae7b897070f0e0bab5b75c1a0448104..412041a4163952c0e9cb60f7839a08c5b19120f9 100644
--- a/ui/gfx/geometry/rect_conversions.cc
+++ b/ui/gfx/geometry/rect_conversions.cc
@@ -17,8 +17,16 @@ Rect ToEnclosingRect(const RectF& rect) {
   int min_y = ToFlooredInt(rect.y());
   float max_x = rect.right();
   float max_y = rect.bottom();
-  int width = rect.width() == 0 ? 0 : std::max(ToCeiledInt(max_x) - min_x, 0);
-  int height = rect.height() == 0 ? 0 : std::max(ToCeiledInt(max_y) - min_y, 0);
+  int width =
+      rect.width() == 0
+          ? 0
+          : std::max(
+                ToCeiledInt(static_cast<float>(ToCeiledInt(max_x)) - min_x), 0);
+  int height =
+      rect.height() == 0
+          ? 0
+          : std::max(
+                ToCeiledInt(static_cast<float>(ToCeiledInt(max_y)) - min_y), 0);
   return Rect(min_x, min_y, width, height);
 }
 
@@ -27,8 +35,10 @@ Rect ToEnclosedRect(const RectF& rect) {
   int min_y = ToCeiledInt(rect.y());
   float max_x = rect.right();
   float max_y = rect.bottom();
-  int width = std::max(ToFlooredInt(max_x) - min_x, 0);
-  int height = std::max(ToFlooredInt(max_y) - min_y, 0);
+  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);
 }