Changeset 162273 in webkit

Timestamp:

Jan 18, 2014 1:24:25 PM (10 years ago)

Author:

Alan Bujtas

Message:

Subpixel layout: IntRect::infiniteRect() overflows when subpixel layout is enabled.
​https://bugs.webkit.org/show_bug.cgi?id=126899

Reviewed by Tim Horton.

Use LayoutUnits when setting the infinite values on IntRect::infiniteRect() to ensure
it won't overflow later when the IntRect gets converted to LayoutRect.

Source/WebCore:

Covered by existing tests.

• platform/graphics/IntRect.h:

(WebCore::IntRect::infiniteRect):

LayoutTests:

• platform/mac/TestExpectations: Unskipping svg test (failed with subpixel on)

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/IntRect.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-01-18  Zalan Bujtas  <zalan@apple.com>
+
+        Subpixel layout: IntRect::infiniteRect() overflows when subpixel layout is enabled.
+        https://bugs.webkit.org/show_bug.cgi?id=126899
+
+        Reviewed by Tim Horton.
+
+        Use LayoutUnits when setting the infinite values on IntRect::infiniteRect() to ensure
+        it won't overflow later when the IntRect gets converted to LayoutRect.
+
+        * platform/mac/TestExpectations: Unskipping svg test (failed with subpixel on)
+
 2014-01-18  Anders Carlsson  <andersca@apple.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1358 +1358 @@
 webkit.org/b/126898 css3/flexbox/image-percent-max-height.html
 
-# Subpixel: missing text between svg contents
-webkit.org/b/126899 svg/custom/masking-clipping-hidpi.svg
-
 # Subpixel: misplaced zoomed svg content.
 webkit.org/b/126900 svg/zoom/page/zoom-zoom-coords.xhtml

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-18  Zalan Bujtas  <zalan@apple.com>
+
+        Subpixel layout: IntRect::infiniteRect() overflows when subpixel layout is enabled.
+        https://bugs.webkit.org/show_bug.cgi?id=126899
+
+        Reviewed by Tim Horton.
+
+        Use LayoutUnits when setting the infinite values on IntRect::infiniteRect() to ensure
+        it won't overflow later when the IntRect gets converted to LayoutRect.
+
+        Covered by existing tests.
+
+        * platform/graphics/IntRect.h:
+        (WebCore::IntRect::infiniteRect):
+
 2014-01-18  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/platform/graphics/IntRect.h

@@ -28 +28 @@
 
 #include "IntPoint.h"
+#include "LayoutUnit.h"
 #include <wtf/Vector.h>
 
@@ -237 +238 @@
 inline IntRect IntRect::infiniteRect()
 {
-    static IntRect infiniteRect(-std::numeric_limits<int>::max() / 2, -std::numeric_limits<int>::max() / 2, std::numeric_limits<int>::max(), std::numeric_limits<int>::max());
+    static IntRect infiniteRect(-LayoutUnit::max() / 2, -LayoutUnit::max() / 2, LayoutUnit::max(), LayoutUnit::max());
     return infiniteRect;
 }