Changeset 174643 in webkit for trunk/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution-expected.txt

Timestamp:

Oct 13, 2014, 1:44:24 AM (11 years ago)

Author:

svillar@igalia.com

Message:

[CSS Grid Layout] Pass the valid set of tracks to grow beyond growth limits
​https://bugs.webkit.org/show_bug.cgi?id=137253

Reviewed by Darin Adler.

Source/WebCore:

Section 10.4 of the specs describe how to resolve content based
track sizing functions. Among others it describes the "distribute
extra space" algorithm. The 3rd bullet of that algorithm specifies
how to distribute (and also the target tracks) the extra space
once all the tracks have reached their growth limits.

Our implementation had 2 problems. First we were not passing a
valid subset of tracks (instead we were always using all of
them). Now we use a function that filters the right tracks to be
the target of the extra space distribution depending on whether
we're computing the min track function or the max track function.

Secondly the algorithm that was distributing the extra space was
not using that list of passed in tracks (it iterated over all of
them). From now on it will use the set of tracks selected using
the filter function described above.

• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::resolveContentBasedTrackSizingFunctions):
(WebCore::RenderGrid::resolveContentBasedTrackSizingFunctionsForItems):
(WebCore::RenderGrid::distributeSpaceToTracks):

• rendering/RenderGrid.h:
• rendering/style/GridTrackSize.h:

(WebCore::GridTrackSize::hasMinContentMinTrackBreadthAndMinOrMaxContentMaxTrackBreadth):
(WebCore::GridTrackSize::hasMaxContentMinTrackBreadthAndMaxContentMaxTrackBreadth):

LayoutTests:

• fast/css-grid-layout/grid-content-sized-columns-resolution-expected.txt:
• fast/css-grid-layout/grid-content-sized-columns-resolution.html:

File:

• trunk/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution-expected.txt (modified) (2 diffs)

trunk/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution-expected.txt

@@ -11 +11 @@
 PASS window.getComputedStyle(gridMaxContentAndMinContentFixed, '').getPropertyValue('-webkit-grid-template-columns') is "70px 20px"
 PASS window.getComputedStyle(gridMaxContentAndMaxContentFixed, '').getPropertyValue('-webkit-grid-template-columns') is "55px 35px"
+PASS window.getComputedStyle(gridMinContentFixedAndAutoAboveLimits, '').getPropertyValue('-webkit-grid-template-columns') is "15px 95px"
+PASS window.getComputedStyle(gridMaxContentFixedAndAutoAboveLimits, '').getPropertyValue('-webkit-grid-template-columns') is "65px 85px"
+PASS window.getComputedStyle(gridMinContentFixedAndFixedFixedAndAuto, '').getPropertyValue('-webkit-grid-template-columns') is "20px 20px 60px"
+PASS window.getComputedStyle(gridAutoAndFixedFixedAndMaxContentFixed, '').getPropertyValue('-webkit-grid-template-columns') is "40px 20px 90px"
 PASS successfullyParsed is true
 
@@ -26 +30 @@
 XXXX XXXX
 XXXX XXXX
+XXXX XXXX
+XXXXXXXXXXX
+XXXX XXXX
+XXXXXXXXXXXXXXX
+XXXX XXXX
+XXXXXXXXXX
+XXXX XXXX
+XXXXXXXXXXXXXXX