Merge 87103

Source/WebCore/platform/graphics/FloatRect.cpp

 /*
  * Copyright (C) 2003, 2006, 2007 Apple Inc.  All rights reserved.
  * Copyright (C) 2005 Nokia.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 164 matching lines @@
 void FloatRect::fitToPoints(const FloatPoint& p0, const FloatPoint& p1, const FloatPoint& p2, const FloatPoint& p3)
 {
     float left = min4(p0.x(), p1.x(), p2.x(), p3.x());
     float top = min4(p0.y(), p1.y(), p2.y(), p3.y());
     float right = max4(p0.x(), p1.x(), p2.x(), p3.x());
     float bottom = max4(p0.y(), p1.y(), p2.y(), p3.y());
 
     setLocationAndSizeFromEdges(left, top, right, bottom);
 }
 
-static inline int safeFloatToInt(float x)
-{
-    static const int s_intMax = std::numeric_limits<int>::max();
-    static const int s_intMin = std::numeric_limits<int>::min();
-
-    if (x >= static_cast<float>(s_intMax))
-        return s_intMax;
-    if (x < static_cast<float>(s_intMin))
-        return s_intMin;
-    return static_cast<int>(x);
-}
-
 IntRect enclosingIntRect(const FloatRect& rect)
 {
     float left = floorf(rect.x());
     float top = floorf(rect.y());
     float width = ceilf(rect.maxX()) - left;
     float height = ceilf(rect.maxY()) - top;
     
-    return IntRect(safeFloatToInt(left), safeFloatToInt(top), 
-                   safeFloatToInt(width), safeFloatToInt(height));
+    return IntRect(clampToInteger(left), clampToInteger(top), 
+                   clampToInteger(width), clampToInteger(height));
 }
 
 FloatRect mapRect(const FloatRect& r, const FloatRect& srcRect, const FloatRect& destRect)
 {
     if (srcRect.width() == 0 || srcRect.height() == 0)
         return FloatRect();
 
     float widthScale = destRect.width() / srcRect.width();
     float heightScale = destRect.height() / srcRect.height();
     return FloatRect(destRect.x() + (r.x() - srcRect.x()) * widthScale,
                      destRect.y() + (r.y() - srcRect.y()) * heightScale,
                      r.width() * widthScale, r.height() * heightScale);
 }
 
 }