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

ui/gfx/geometry/rect_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <limits>
 
 #include "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_conversions.h"
@@ skipping 449 matching lines @@
 
     RectF scaled = ScaleRect(r1, tests[i].scale);
     EXPECT_FLOAT_AND_NAN_EQ(r2.x(), scaled.x());
     EXPECT_FLOAT_AND_NAN_EQ(r2.y(), scaled.y());
     EXPECT_FLOAT_AND_NAN_EQ(r2.width(), scaled.width());
     EXPECT_FLOAT_AND_NAN_EQ(r2.height(), scaled.height());
   }
 }
 
 TEST(RectTest, ToEnclosedRect) {
+  static const int max_int = std::numeric_limits<int>::max();
+  static const int min_int = std::numeric_limits<int>::min();
+  static const float max_float = std::numeric_limits<float>::max();
   static const struct Test {
     float x1; // source
     float y1;
     float w1;
     float h1;
     int x2; // target
     int y2;
     int w2;
     int h2;
-  } tests [] = {
-    { 0.0f, 0.0f, 0.0f, 0.0f,
-      0, 0, 0, 0 },
-    { -1.5f, -1.5f, 3.0f, 3.0f,
-      -1, -1, 2, 2 },
-    { -1.5f, -1.5f, 3.5f, 3.5f,
-      -1, -1, 3, 3 },
-    { std::numeric_limits<float>::max(),
-      std::numeric_limits<float>::max(),
-      2.0f, 2.0f,
-      std::numeric_limits<int>::max(),
-      std::numeric_limits<int>::max(),
-      0, 0 },
-    { 0.0f, 0.0f,
-      std::numeric_limits<float>::max(),
-      std::numeric_limits<float>::max(),
-      0, 0,
-      std::numeric_limits<int>::max(),
-      std::numeric_limits<int>::max() },
-    { 20000.5f, 20000.5f, 0.5f, 0.5f,
-      20001, 20001, 0, 0 },
-  };
+  } tests[] = {{0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0},
+               {-1.5f, -1.5f, 3.0f, 3.0f, -1, -1, 2, 2},
+               {-1.5f, -1.5f, 3.5f, 3.5f, -1, -1, 3, 3},
+               {max_float, max_float, 2.0f, 2.0f, max_int, max_int, 0, 0},
+               {0.0f, 0.0f, max_float, max_float, 0, 0, max_int, max_int},
+               {20000.5f, 20000.5f, 0.5f, 0.5f, 20001, 20001, 0, 0},
+               {min_int, min_int, max_int * 2.f, max_int * 2.f, min_int,
+                min_int, max_int, max_int},
+               {max_int, max_int, max_int, max_int, max_int, max_int, 0, 0}};
 
   for (size_t i = 0; i < arraysize(tests); ++i) {
     RectF r1(tests[i].x1, tests[i].y1, tests[i].w1, tests[i].h1);
     Rect r2(tests[i].x2, tests[i].y2, tests[i].w2, tests[i].h2);
 
     Rect enclosed = ToEnclosedRect(r1);
     EXPECT_FLOAT_AND_NAN_EQ(r2.x(), enclosed.x());
     EXPECT_FLOAT_AND_NAN_EQ(r2.y(), enclosed.y());
     EXPECT_FLOAT_AND_NAN_EQ(r2.width(), enclosed.width());
     EXPECT_FLOAT_AND_NAN_EQ(r2.height(), enclosed.height());
   }
 }
 
 TEST(RectTest, ToEnclosingRect) {
+  static const int max_int = std::numeric_limits<int>::max();
+  static const int min_int = std::numeric_limits<int>::min();
+  static const float max_float = std::numeric_limits<float>::max();
   static const struct Test {
     float x1; // source
     float y1;
     float w1;
     float h1;
     int x2; // target
     int y2;
     int w2;
     int h2;
-  } tests [] = {
-    { 0.0f, 0.0f, 0.0f, 0.0f,
-      0, 0, 0, 0 },
-    { 5.5f, 5.5f, 0.0f, 0.0f,
-      5, 5, 0, 0 },
-    { -1.5f, -1.5f, 3.0f, 3.0f,
-      -2, -2, 4, 4 },
-    { -1.5f, -1.5f, 3.5f, 3.5f,
-      -2, -2, 4, 4 },
-    { std::numeric_limits<float>::max(),
-      std::numeric_limits<float>::max(),
-      2.0f, 2.0f,
-      std::numeric_limits<int>::max(),
-      std::numeric_limits<int>::max(),
-      0, 0 },
-    { 0.0f, 0.0f,
-      std::numeric_limits<float>::max(),
-      std::numeric_limits<float>::max(),
-      0, 0,
-      std::numeric_limits<int>::max(),
-      std::numeric_limits<int>::max() },
-    { 20000.5f, 20000.5f, 0.5f, 0.5f,
-      20000, 20000, 1, 1 },
-  };
+  } tests[] = {{0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0},
+               {5.5f, 5.5f, 0.0f, 0.0f, 5, 5, 0, 0},
+               {-1.5f, -1.5f, 3.0f, 3.0f, -2, -2, 4, 4},
+               {-1.5f, -1.5f, 3.5f, 3.5f, -2, -2, 4, 4},
+               {max_float, max_float, 2.0f, 2.0f, max_int, max_int, 0, 0},
+               {0.0f, 0.0f, max_float, max_float, 0, 0, max_int, max_int},
+               {20000.5f, 20000.5f, 0.5f, 0.5f, 20000, 20000, 1, 1},
+               {min_int, min_int, max_int * 2.f, max_int * 2.f, min_int,
+                min_int, max_int, max_int},
+               {max_int, max_int, max_int, max_int, max_int, max_int, 0, 0}};
 
   for (size_t i = 0; i < arraysize(tests); ++i) {
     RectF r1(tests[i].x1, tests[i].y1, tests[i].w1, tests[i].h1);
     Rect r2(tests[i].x2, tests[i].y2, tests[i].w2, tests[i].h2);
 
     Rect enclosed = ToEnclosingRect(r1);
     EXPECT_FLOAT_AND_NAN_EQ(r2.x(), enclosed.x());
     EXPECT_FLOAT_AND_NAN_EQ(r2.y(), enclosed.y());
     EXPECT_FLOAT_AND_NAN_EQ(r2.width(), enclosed.width());
     EXPECT_FLOAT_AND_NAN_EQ(r2.height(), enclosed.height());
@@ skipping 346 matching lines @@
       0.0f, f.ManhattanInternalDistance(gfx::RectF(-1.0f, 0.0f, 1.1f, 1.0f)));
   EXPECT_FLOAT_EQ(
       0.1f + kEpsilon,
       f.ManhattanInternalDistance(gfx::RectF(-1.5f, 0.0f, 1.4f, 1.0f)));
   EXPECT_FLOAT_EQ(
       kEpsilon,
       f.ManhattanInternalDistance(gfx::RectF(-1.5f, 0.0f, 1.5f, 1.0f)));
 }
 
 }  // namespace gfx