Type conversion fixes, ui/gfx/ edition.

ui/gfx/geometry/rect.h

 // Copyright (c) 2012 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.
 
 // Defines a simple integer rectangle class.  The containment semantics
 // are array-like; that is, the coordinate (x, y) is considered to be
 // contained by the rectangle, but the coordinate (x + width, y) is not.
 // The class will happily let you create malformed rectangles (that is,
 // rectangles with negative width and/or height), but there will be assertions
 // in the operations (such as Contains()) to complain in this case.
 
 #ifndef UI_GFX_GEOMETRY_RECT_H_
 #define UI_GFX_GEOMETRY_RECT_H_
 
 #include <cmath>
 #include <iosfwd>
 #include <string>
 
+#include "base/numerics/safe_conversions.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect_f.h"
+#include "ui/gfx/geometry/safe_integer_conversions.h"

[danakj, 2014/11/03 20:35:26]

unused?

[Peter Kasting, 2014/11/03 22:19:55]

Oops, thanks.

 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/geometry/vector2d.h"
 
 #if defined(OS_WIN)
 typedef struct tagRECT RECT;
 #elif defined(OS_IOS)
 #include <CoreGraphics/CoreGraphics.h>
 #elif defined(OS_MACOSX)
 #include <ApplicationServices/ApplicationServices.h>
 #endif
@@ skipping 21 matching lines @@
 
 #if defined(OS_WIN)
   // Construct an equivalent Win32 RECT object.
   RECT ToRECT() const;
 #elif defined(OS_MACOSX)
   // Construct an equivalent CoreGraphics object.
   CGRect ToCGRect() const;
 #endif
 
   operator RectF() const {
-    return RectF(origin().x(), origin().y(), size().width(), size().height());
+    return RectF(static_cast<float>(x()), static_cast<float>(y()),
+                 static_cast<float>(width()), static_cast<float>(height()));
   }
 
   int x() const { return origin_.x(); }
   void set_x(int x) { origin_.set_x(x); }
 
   int y() const { return origin_.y(); }
   void set_y(int y) { origin_.set_y(y); }
 
   int width() const { return size_.width(); }
   void set_width(int width) { size_.set_width(width); }
@@ skipping 140 matching lines @@
 //
 // This could also be thought of as "the smallest rect that contains both
 // points", except that we consider points on the right/bottom edges of the
 // rect to be outside the rect.  So technically one or both points will not be
 // contained within the rect, because they will appear on one of these edges.
 GFX_EXPORT Rect BoundingRect(const Point& p1, const Point& p2);
 
 inline Rect ScaleToEnclosingRect(const Rect& rect,
                                  float x_scale,
                                  float y_scale) {
-  int x = std::floor(rect.x() * x_scale);
-  int y = std::floor(rect.y() * y_scale);
-  int r = rect.width() == 0 ? x : std::ceil(rect.right() * x_scale);
-  int b = rect.height() == 0 ? y : std::ceil(rect.bottom() * y_scale);
+  // These next functions cast instead of using e.g. ToFlooredInt() because we
+  // haven't checked to ensure that the clamping behavior of the helper
+  // functions doesn't degrade performance, and callers shouldn't be passing
+  // values that cause overflow anyway.
+  float scaled_x = std::floor(rect.x() * x_scale);
+  DCHECK(base::IsValueInRangeForNumericType<int>(scaled_x));

[danakj, 2014/11/03 20:35:26]

nit: it might be easier to read if you just moved all these DCHECKs to the top
of the method and just duplicate the math in them?

i.e.
DCHECK(base::IsValue...Type<int>(rect.x() * x_scale);
DCHECK(base::IsValue...Type<int>(rect.y() * y_scale);
DCHECK(base::IsValue...Type<int>(rect.right() * x_scale);
DCHECK(base::IsValue...Type<int>(rect.bottom() * y_scale);
...actual code...

[Peter Kasting, 2014/11/03 22:19:55]

Done.

+  int x = static_cast<int>(scaled_x);
+  float scaled_y = std::floor(rect.y() * y_scale);
+  DCHECK(base::IsValueInRangeForNumericType<int>(scaled_y));
+  int y = static_cast<int>(scaled_y);
+  int r, b;
+  if (rect.width() == 0) {
+    r = x;
+  } else {
+    float scaled_r = std::ceil(rect.right() * x_scale);
+    DCHECK(base::IsValueInRangeForNumericType<int>(scaled_r));
+    r = static_cast<int>(scaled_r);
+  }
+  if (rect.height() == 0) {
+    b = y;
+  } else {
+    float scaled_b = std::ceil(rect.bottom() * y_scale);
+    DCHECK(base::IsValueInRangeForNumericType<int>(scaled_b));
+    b = static_cast<int>(scaled_b);
+  }
   return Rect(x, y, r - x, b - y);
 }
 
 inline Rect ScaleToEnclosingRect(const Rect& rect, float scale) {
   return ScaleToEnclosingRect(rect, scale, scale);
 }
 
 inline Rect ScaleToEnclosedRect(const Rect& rect,
                                 float x_scale,
                                 float y_scale) {
-  int x = std::ceil(rect.x() * x_scale);
-  int y = std::ceil(rect.y() * y_scale);
-  int r = rect.width() == 0 ? x : std::floor(rect.right() * x_scale);
-  int b = rect.height() == 0 ? y : std::floor(rect.bottom() * y_scale);
+  float scaled_x = std::ceil(rect.x() * x_scale);
+  DCHECK(base::IsValueInRangeForNumericType<int>(scaled_x));
+  int x = static_cast<int>(scaled_x);
+  float scaled_y = std::ceil(rect.y() * y_scale);
+  DCHECK(base::IsValueInRangeForNumericType<int>(scaled_y));
+  int y = static_cast<int>(scaled_y);
+  int r, b;
+  if (rect.width() == 0) {
+    r = x;
+  } else {
+    float scaled_r = std::floor(rect.right() * x_scale);
+    DCHECK(base::IsValueInRangeForNumericType<int>(scaled_r));
+    r = static_cast<int>(scaled_r);
+  }
+  if (rect.height() == 0) {
+    b = y;
+  } else {
+    float scaled_b = std::floor(rect.bottom() * y_scale);
+    DCHECK(base::IsValueInRangeForNumericType<int>(scaled_b));
+    b = static_cast<int>(scaled_b);
+  }
   return Rect(x, y, r - x, b - y);
 }
 
 inline Rect ScaleToEnclosedRect(const Rect& rect, float scale) {
   return ScaleToEnclosedRect(rect, scale, scale);
 }
 
 // This is declared here for use in gtest-based unit tests but is defined in
 // the gfx_test_support target. Depend on that to use this in your unit test.
 // This should not be used in production code - call ToString() instead.
 void PrintTo(const Rect& rect, ::std::ostream* os);
 
 }  // namespace gfx
 
 #endif  // UI_GFX_GEOMETRY_RECT_H_