| Index: LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html
|
| diff --git a/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html b/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html
|
| index 8c6cef1d2393c6d8ff7d5ba1d8172ff774077c54..b85aaa4a26f644cff28e89674ad07d15d9c37d0e 100644
|
| --- a/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html
|
| +++ b/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html
|
| @@ -98,6 +98,168 @@
|
| <div class="firstRowBothColumn">XXXX XXXX</div>
|
| </div>
|
|
|
| +<!-- Check that items are processed by ascending span instead of going track by track forbidding extra space distribution. -->
|
| +<div class="constrainedContainer">
|
| + <div class="grid gridMinContentFixedAndAuto" id="gridMinContentFixedAndAutoUnsortedConstrained">
|
| + <div class="firstRowBothColumn">XXXX XXXX</div>
|
| + <div class="firstRowSecondColumn">XXXX XXXX</div>
|
| + </div>
|
| +</div>
|
| +
|
| +<div class="constrainedContainer">
|
| + <div class="grid gridAutoAndAuto" id="gridAutoAndAutoUnsortedConstrained">
|
| + <div class="firstRowBothColumn">XXXX XXXX</div>
|
| + <div class="firstRowSecondColumn">XXX</div>
|
| + </div>
|
| +</div>
|
| +
|
| +<div class="constrainedContainer">
|
| + <div class="grid gridMinContentAndMinContentFixed" id="gridMinContentAndMinContentFixedUnsortedConstrained">
|
| + <div class="firstRowBothColumn">XXXX XXXX</div>
|
| + <div class="firstRowBothColumn">XX XX XX</div>
|
| + <div class="firstRowSecondColumn">XXXX XXXX</div>
|
| + </div>
|
| +</div>
|
| +
|
| +<div class="constrainedContainer">
|
| + <div class="grid gridMaxContentAndMinContent" id="gridMaxContentAndMinContentUnsortedConstrained">
|
| + <div class="firstRowBothColumn">XXX XXX</div>
|
| + <div class="firstRowSecondColumn">XXXXXXX</div>
|
| + </div>
|
| +</div>
|
| +
|
| +<div class="constrainedContainer">
|
| + <div class="grid gridFixedMinContentAndMaxContent" id="gridFixedMinContentAndMaxContentUnsortedConstrained">
|
| + <div class="firstRowBothColumn">XXXXX XX</div>
|
| + <div class="firstRowSecondColumn">XXX</div>
|
| + <div class="firstRowSecondColumn">XXXXX</div>
|
| + </div>
|
| +</div>
|
| +
|
| +<div class="constrainedContainer">
|
| + <div class="grid gridFixedMaxContentAndMinContent" id="gridFixedMaxContentAndMinContentUnsortedConstrained">
|
| + <div class="firstRowBothColumn">XXXX XXXX</div>
|
| + <div class="firstRowBothColumn">X X</div>
|
| + <div class="firstRowSecondColumn">XXXX</div>
|
| + </div>
|
| +</div>
|
| +
|
| +<div class="constrainedContainer">
|
| + <div class="grid gridMinContentAndMaxContentFixed" id="gridMinContentAndMaxContentFixedUnsortedConstrained">
|
| + <div class="firstRowBothColumn">XXXX XXXX</div>
|
| + <div class="firstRowSecondColumn">XXXX XXXX</div>
|
| + </div>
|
| +</div>
|
| +
|
| +<div class="constrainedContainer">
|
| + <div class="grid gridMaxContentFixedAndAuto" id="gridMaxContentFixedAndAutoUnsortedConstrained">
|
| + <div class="firstRowBothColumn">XX XX</div>
|
| + <div class="firstRowSecondColumn">XXXX</div>
|
| + <div class="firstRowSecondColumn">XXX XXX</div>
|
| + </div>
|
| +</div>
|
| +
|
| +<div class="constrainedContainer">
|
| + <div class="grid gridAutoMinContent" id="gridAutoMinContentUnsortedConstrained">
|
| + <div class="firstRowBothColumn">XX XX XX XX</div>
|
| + <div class="firstRowSecondColumn">XXXXXX XXXXXX</div>
|
| + </div>
|
| +</div>
|
| +
|
| +<div class="constrainedContainer">
|
| + <div class="grid gridAutoMaxContent" id="gridAutoMaxContentUnsortedConstrained">
|
| + <div class="firstRowBothColumn">XXXX XXXX</div>
|
| + <div class="firstRowBothColumn">XXX XXX</div>
|
| + <div class="firstRowSecondColumn">XXXXX</div>
|
| + </div>
|
| +</div>
|
| +
|
| +<div class="constrainedContainer">
|
| + <div class="grid gridMaxContentAndMinContentFixed" id="gridMaxContentAndMinContentFixedUnsortedConstrained">
|
| + <div class="firstRowBothColumn">XXX XXX</div>
|
| + <div class="firstRowBothColumn">XXXX XXXX</div>
|
| + <div class="firstRowSecondColumn">XXXX XXXX</div>
|
| + <div class="firstRowSecondColumn">XX</div>
|
| + </div>
|
| +</div>
|
| +
|
| +<div class="constrainedContainer">
|
| + <div class="grid gridMaxContentAndMaxContentFixed" id="gridMaxContentAndMaxContentFixedUnsortedConstrained">
|
| + <div class="firstRowBothColumn">XXXX XXXX</div>
|
| + <div class="firstRowBothColumn">XX XX XX XX</div>
|
| + <div class="firstRowSecondColumn">XXXXXXX</div>
|
| + </div>
|
| +</div>
|
| +
|
| +<!-- Check that items are processed by ascending span instead of going track by track allowing extra space distribution. -->
|
| +<div class="grid gridMinContentFixedAndAuto" id="gridMinContentFixedAndAutoUnsorted">
|
| + <div class="firstRowBothColumn">XXXX XXXX</div>
|
| + <div class="firstRowSecondColumn">XXXX XXXX</div>
|
| +</div>
|
| +
|
| +<div class="grid gridAutoAndAuto" id="gridAutoAndAutoUnsorted">
|
| + <div class="firstRowBothColumn">XXXX XXXX</div>
|
| + <div class="firstRowSecondColumn">XXX</div>
|
| +</div>
|
| +
|
| +<div class="grid gridMinContentAndMinContentFixed" id="gridMinContentAndMinContentFixedUnsorted">
|
| + <div class="firstRowBothColumn">XXXX XXXX</div>
|
| + <div class="firstRowBothColumn">XX XX XX XX</div>
|
| + <div class="firstRowSecondColumn">XXXX XXXX</div>
|
| +</div>
|
| +
|
| +<div class="grid gridMaxContentAndMinContent" id="gridMaxContentAndMinContentUnsorted">
|
| + <div class="firstRowBothColumn">XXX XXX</div>
|
| + <div class="firstRowSecondColumn">XXXXXXX</div>
|
| +</div>
|
| +
|
| +<div class="grid gridFixedMinContentAndMaxContent" id="gridFixedMinContentAndMaxContentUnsorted">
|
| + <div class="firstRowBothColumn">XXXXX XX</div>
|
| + <div class="firstRowSecondColumn">XXX</div>
|
| + <div class="firstRowSecondColumn">XXXXX</div>
|
| +</div>
|
| +
|
| +<div class="grid gridFixedMaxContentAndMinContent" id="gridFixedMaxContentAndMinContentUnsorted">
|
| + <div class="firstRowBothColumn">XXXX XXXX</div>
|
| + <div class="firstRowBothColumn">X X</div>
|
| + <div class="firstRowSecondColumn">XXXX</div>
|
| +</div>
|
| +
|
| +<div class="grid gridMinContentAndMaxContentFixed" id="gridMinContentAndMaxContentFixedUnsorted">
|
| + <div class="firstRowBothColumn">XXXX XXXX</div>
|
| + <div class="firstRowSecondColumn">XXXX XXXX</div>
|
| +</div>
|
| +
|
| +<div class="grid gridMaxContentFixedAndAuto" id="gridMaxContentFixedAndAutoUnsorted">
|
| + <div class="firstRowBothColumn">XX XX</div>
|
| + <div class="firstRowSecondColumn">XXXX</div>
|
| + <div class="firstRowSecondColumn">XXX XXX</div>
|
| +</div>
|
| +
|
| +<div class="grid gridAutoMinContent" id="gridAutoMinContentUnsorted">
|
| + <div class="firstRowBothColumn">XX XX XX XX</div>
|
| + <div class="firstRowSecondColumn">XXXXXX XXXXXX</div>
|
| +</div>
|
| +
|
| +<div class="grid gridAutoMaxContent" id="gridAutoMaxContentUnsorted">
|
| + <div class="firstRowBothColumn">XXXX XXXX</div>
|
| + <div class="firstRowBothColumn">XXX XXX</div>
|
| + <div class="firstRowSecondColumn">XXXXX</div>
|
| +</div>
|
| +
|
| +<div class="grid gridMaxContentAndMinContentFixed" id="gridMaxContentAndMinContentFixedUnsorted">
|
| + <div class="firstRowBothColumn">XXX XXX</div>
|
| + <div class="firstRowBothColumn">XXXX XXXX</div>
|
| + <div class="firstRowSecondColumn">XXXX XXXX</div>
|
| + <div class="firstRowSecondColumn">XX</div>
|
| +</div>
|
| +
|
| +<div class="grid gridMaxContentAndMaxContentFixed" id="gridMaxContentAndMaxContentFixedUnsorted">
|
| + <div class="firstRowBothColumn">XXXX XXXX</div>
|
| + <div class="firstRowBothColumn">XX XX XX XX</div>
|
| + <div class="firstRowSecondColumn">XXXXXXX</div>
|
| +</div>
|
| +
|
| <script>
|
| function testGridColumnsValues(id, computedColumnValue)
|
| {
|
| @@ -116,6 +278,36 @@
|
| testGridColumnsValues("gridAutoMaxContent", "20px 70px");
|
| testGridColumnsValues("gridMaxContentAndMinContentFixed", "70px 20px");
|
| testGridColumnsValues("gridMaxContentAndMaxContentFixed", "55px 35px");
|
| +
|
| + debug("");
|
| + debug("Check that items are processed by ascending span to compute track breadths forbidding extra space distribution.");
|
| + testGridColumnsValues("gridMinContentFixedAndAutoUnsortedConstrained", "0px 40px");
|
| + testGridColumnsValues("gridAutoAndAutoUnsortedConstrained", "5px 35px");
|
| + testGridColumnsValues("gridMinContentAndMinContentFixedUnsortedConstrained", "0px 40px");
|
| + testGridColumnsValues("gridMaxContentAndMinContentUnsortedConstrained", "0px 70px");
|
| + testGridColumnsValues("gridFixedMinContentAndMaxContentUnsortedConstrained", "10px 70px");
|
| + testGridColumnsValues("gridFixedMaxContentAndMinContentUnsortedConstrained", "10px 40px");
|
| + testGridColumnsValues("gridMinContentAndMaxContentFixedUnsortedConstrained", "0px 90px");
|
| + testGridColumnsValues("gridMaxContentFixedAndAutoUnsortedConstrained", "10px 40px");
|
| + testGridColumnsValues("gridAutoMinContentUnsortedConstrained", "0px 60px");
|
| + testGridColumnsValues("gridAutoMaxContentUnsortedConstrained", "0px 90px");
|
| + testGridColumnsValues("gridMaxContentAndMinContentFixedUnsortedConstrained", "50px 40px");
|
| + testGridColumnsValues("gridMaxContentAndMaxContentFixedUnsortedConstrained", "40px 70px");
|
| +
|
| + debug("");
|
| + debug("Check that items are processed by ascending span to compute track breadths allowing extra space distribution.");
|
| + testGridColumnsValues("gridMinContentFixedAndAutoUnsorted", "15px 90px");
|
| + testGridColumnsValues("gridAutoAndAutoUnsorted", "30px 60px");
|
| + testGridColumnsValues("gridMinContentAndMinContentFixedUnsorted", "10px 40px");
|
| + testGridColumnsValues("gridMaxContentAndMinContentUnsorted", "0px 70px");
|
| + testGridColumnsValues("gridFixedMinContentAndMaxContentUnsorted", "10px 70px");
|
| + testGridColumnsValues("gridFixedMaxContentAndMinContentUnsorted", "50px 40px");
|
| + testGridColumnsValues("gridMinContentAndMaxContentFixedUnsorted", "10px 90px");
|
| + testGridColumnsValues("gridMaxContentFixedAndAutoUnsorted", "15px 70px");
|
| + testGridColumnsValues("gridAutoMinContentUnsorted", "50px 60px");
|
| + testGridColumnsValues("gridAutoMaxContentUnsorted", "0px 90px");
|
| + testGridColumnsValues("gridMaxContentAndMinContentFixedUnsorted", "55px 40px");
|
| + testGridColumnsValues("gridMaxContentAndMaxContentFixedUnsorted", "75px 70px");
|
| </script>
|
| </body>
|
| </html>
|
|
|