| 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..e72b3be3afd9bb2a0b49da46d86618627db92264 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
|
| @@ -41,6 +41,12 @@
|
| .gridMaxContentAndMaxContentFixed {
|
| grid-template-columns: max-content minmax(max-content, 35px);
|
| }
|
| + .gridMinContentFixedAndFixedFixedAndAuto {
|
| + grid-template-columns: minmax(min-content, 20px) minmax(20px, 30px) auto;
|
| + }
|
| + .gridAutoAndFixedFixedAndMaxContentFixed {
|
| + grid-template-columns: auto minmax(20px, 30px) minmax(max-content, 20px);
|
| + }
|
|
|
| </style>
|
| <script src="../../resources/js-test.js"></script>
|
| @@ -98,6 +104,35 @@
|
| <div class="firstRowBothColumn">XXXX XXXX</div>
|
| </div>
|
|
|
| +<!-- The next four force the grid to grow only a particular subset of tracks above the limits -->
|
| +<div class="constrainedContainer">
|
| + <div class="grid gridMinContentFixedAndAuto" id="gridMinContentFixedAndAutoAboveLimits">
|
| + <div class="firstRowBothColumn">XXXX XXXX</div>
|
| + <div class="firstRowBothColumn">XXXXXXXXXXX</div>
|
| + </div>
|
| +</div>
|
| +
|
| +<div class="constrainedContainer">
|
| + <div class="grid gridMaxContentFixedAndAuto" id="gridMaxContentFixedAndAutoAboveLimits">
|
| + <div class="firstRowBothColumn">XXXX XXXX</div>
|
| + <div class="firstRowBothColumn">XXXXXXXXXXXXXXX</div>
|
| + </div>
|
| +</div>
|
| +
|
| +<div class="constrainedContainer">
|
| + <div class="grid gridMinContentFixedAndFixedFixedAndAuto" id="gridMinContentFixedAndFixedFixedAndAuto">
|
| + <div class="firstRowBothColumn">XXXX XXXX</div>
|
| + <div class="firstRowBothColumn">XXXXXXXXXX</div>
|
| + </div>
|
| +</div>
|
| +
|
| +<div class="constrainedContainer">
|
| + <div class="grid gridAutoAndFixedFixedAndMaxContentFixed" id="gridAutoAndFixedFixedAndMaxContentFixed">
|
| + <div class="firstRowBothColumn">XXXX XXXX</div>
|
| + <div class="firstRowBothColumn">XXXXXXXXXXXXXXX</div>
|
| + </div>
|
| +</div>
|
| +
|
| <script>
|
| function testGridColumnsValues(id, computedColumnValue)
|
| {
|
| @@ -116,6 +151,11 @@
|
| testGridColumnsValues("gridAutoMaxContent", "20px 70px");
|
| testGridColumnsValues("gridMaxContentAndMinContentFixed", "70px 20px");
|
| testGridColumnsValues("gridMaxContentAndMaxContentFixed", "55px 35px");
|
| +
|
| + testGridColumnsValues("gridMinContentFixedAndAutoAboveLimits", "15px 95px");
|
| + testGridColumnsValues("gridMaxContentFixedAndAutoAboveLimits", "65px 85px");
|
| + testGridColumnsValues("gridMinContentFixedAndFixedFixedAndAuto", "20px 20px 60px");
|
| + testGridColumnsValues("gridAutoAndFixedFixedAndMaxContentFixed", "40px 20px 90px");
|
| </script>
|
| </body>
|
| </html>
|
|
|