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

Timestamp:

May 25, 2016, 12:52:53 PM (10 years ago)

Author:

Manuel Rego Casasnovas

Message:

[css-grid] Update <fixed-size> syntax
​https://bugs.webkit.org/show_bug.cgi?id=158063

Reviewed by Darin Adler.

Source/WebCore:

The syntax for <fixed-size> has been updated on the spec:
​https://drafts.csswg.org/css-grid/#typedef-fixed-size

New syntax is:

<fixed-size> =

<fixed-breadth> |
minmax( <fixed-breadth> , <track-breadth> ) |
minmax( <inflexible-breadth> , <fixed-breadth> )

This means that it's enough to have one <fixed-breadth>,
it doesn't matter if it's as minimum or maximum.
Before it was required that the minimum was fixed.

• css/CSSParser.cpp:

(WebCore::isGridTrackFixedSized):

• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::computeAutoRepeatTracksCount):

LayoutTests:

Updated test to check the new expected behavior.

• fast/css-grid-layout/grid-element-auto-repeat-get-set-expected.txt:
• fast/css-grid-layout/grid-element-auto-repeat-get-set.html:

File:

• trunk/Source/WebCore/rendering/RenderGrid.cpp (modified) (1 diff)

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -1228 +1228 @@
     auto autoTrackSize = autoRepeatTracks.at(0);
     ASSERT(autoTrackSize.minTrackBreadth().isLength());
-    ASSERT(!autoTrackSize.minTrackBreadth().isContentSized());
+    ASSERT(!autoTrackSize.minTrackBreadth().isFlex());
 
     Optional<LayoutUnit> availableSize = isRowAxis ? availableLogicalWidth() : computeContentLogicalHeight(MainOrPreferredSize, style().logicalHeight(), Nullopt);