Changeset 154730 in webkit for trunk/Source/WebCore/rendering/RenderGrid.cpp

Timestamp:

Aug 28, 2013, 2:58:33 AM (12 years ago)

Author:

sergio@webkit.org

Message:

[CSS Grid Layout] infinity should be defined as a negative value
​https://bugs.webkit.org/show_bug.cgi?id=107053

Reviewed by Andreas Kling.

From Blink r154805 by <​jchaffraix@chromium.org>

Source/WebCore:

Reject negative values for track-breadth at parse time as
mentioned in the latest versions of the spec.

Added some extra checks to the existing tests.

• css/CSSParser.cpp:

(WebCore::CSSParser::parseGridBreadth):

• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::computeUsedBreadthOfMaxLength):

LayoutTests:

Added some new test cases to check that track-breadth cannot be a
negative value, either it's a length, a percentage...

• fast/css-grid-layout/grid-columns-rows-get-set-expected.txt:
• fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt:
• fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js:
• fast/css-grid-layout/resources/grid-columns-rows-get-set.js:

File:

• trunk/Source/WebCore/rendering/RenderGrid.cpp (modified) (2 diffs)

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -34 +34 @@
 namespace WebCore {
 
-static const int infinity = intMaxForLayoutUnit;
+static const int infinity = -1;
 
 class GridTrack {
@@ -304 +304 @@
     if (trackLength.isFixed() || trackLength.isPercent() || trackLength.isViewportPercentage()) {
         LayoutUnit computedBreadth = computeUsedBreadthOfSpecifiedLength(direction, trackLength);
-        // FIXME: We should ASSERT that computedBreadth cannot return infinity but it's currently
-        // possible. See https://bugs.webkit.org/show_bug.cgi?id=107053
+        ASSERT(computedBreadth != infinity);
         return computedBreadth;
     }