Merge 127933

Source/WebCore/platform/graphics/FractionalLayoutRect.h

 /*
  * Copyright (c) 2012, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 147 matching lines @@
     void inflateY(FractionalLayoutUnit dy)
     {
         m_location.setY(m_location.y() - dy);
         m_size.setHeight(m_size.height() + dy + dy);
     }
     void inflate(FractionalLayoutUnit d) { inflateX(d); inflateY(d); }
     void scale(float s);
 
     FractionalLayoutRect transposedRect() const { return FractionalLayoutRect(m_location.transposedPoint(), m_size.transposedSize()); }
 
-    static FractionalLayoutRect infiniteRect() {return FractionalLayoutRect(FractionalLayoutUnit::min() / 2, FractionalLayoutUnit::min() / 2, FractionalLayoutUnit::max(), FractionalLayoutUnit::max()); }
+    static FractionalLayoutRect infiniteRect()
+    {
+        // Return a rect that is slightly smaller than the true max rect to allow pixelSnapping to round up to the nearest IntRect without overflowing.
+        return FractionalLayoutRect(FractionalLayoutUnit::nearlyMin() / 2, FractionalLayoutUnit::nearlyMin() / 2, FractionalLayoutUnit::nearlyMax(), FractionalLayoutUnit::nearlyMax());
+    }
 
 #if PLATFORM(QT)
     explicit FractionalLayoutRect(const QRect&);
     explicit FractionalLayoutRect(const QRectF&);
     operator QRectF() const;
 #endif
 
 private:
     FractionalLayoutPoint m_location;
     FractionalLayoutSize m_size;
@@ skipping 21 matching lines @@
 }
 
 inline bool operator!=(const FractionalLayoutRect& a, const FractionalLayoutRect& b)
 {
     return a.location() != b.location() || a.size() != b.size();
 }
 
 inline IntRect pixelSnappedIntRect(const FractionalLayoutRect& rect)
 {
 #if ENABLE(SUBPIXEL_LAYOUT)
-    IntPoint roundedLocation = roundedIntPoint(rect.location());
-    return IntRect(roundedLocation, IntSize((rect.x() + rect.width()).round() - roundedLocation.x(),
-                                            (rect.y() + rect.height()).round() - roundedLocation.y()));
+    return IntRect(roundedIntPoint(rect.location()), IntSize(snapSizeToPixel(rect.width(), rect.x()),
+                                                             snapSizeToPixel(rect.height(), rect.y())));
+
 #else
     return IntRect(rect);
 #endif
 }
 
 IntRect enclosingIntRect(const FractionalLayoutRect&);
 FractionalLayoutRect enclosingFractionalLayoutRect(const FloatRect&);
 
 } // namespace WebCore
 
 #endif // FractionalLayoutRect_h