| Index: third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html
|
| diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html
|
| index 61af9108fcd823f92eb2ceec35d50959b337ac44..a69f047ae00721ff49b0aaf43931693f64410f54 100644
|
| --- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html
|
| +++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html
|
| @@ -1,10 +1,14 @@
|
| <html>
|
| <head>
|
| <link href="resources/grid.css" rel="stylesheet"/>
|
| +<link href="resources/grid-alignment.css" rel="stylesheet"/>
|
| <style>
|
| .grid {
|
| font: 10px/1 Ahem;
|
| }
|
| + .gridWidth300 {
|
| + width: 300px;
|
| + }
|
| .gridMinContentFixedAndAuto {
|
| grid-template-columns: minmax(min-content, 15px) auto;
|
| }
|
| @@ -58,11 +62,11 @@
|
| <script src="../../resources/js-test.js"></script>
|
| </head>
|
| <body>
|
| -<div class="grid gridMinContentFixedAndAuto" id="gridMinContentFixedAndAuto">
|
| +<div class="grid gridMinContentFixedAndAuto justifyContentStart" id="gridMinContentFixedAndAuto">
|
| <div class="firstRowBothColumn">XXXX XXXX</div>
|
| </div>
|
|
|
| -<div class="grid gridAutoAndAuto" id="gridAutoAndAuto">
|
| +<div class="grid gridAutoAndAuto justifyContentStart" id="gridAutoAndAuto">
|
| <div class="firstRowBothColumn">XXXX XXXX</div>
|
| </div>
|
|
|
| @@ -92,11 +96,11 @@
|
| </div>
|
| </div>
|
|
|
| -<div class="grid gridAutoMinContent" id="gridAutoMinContent">
|
| +<div class="grid gridAutoMinContent justifyContentStart" id="gridAutoMinContent">
|
| <div class="firstRowBothColumn">XXXX XXXX</div>
|
| </div>
|
|
|
| -<div class="grid gridAutoMaxContent" id="gridAutoMaxContent">
|
| +<div class="grid gridAutoMaxContent justifyContentStart" id="gridAutoMaxContent">
|
| <div class="firstRowBothColumn">XXXX XXXX</div>
|
| </div>
|
|
|
| @@ -204,12 +208,12 @@
|
| </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="grid gridMinContentFixedAndAuto justifyContentStart" id="gridMinContentFixedAndAutoUnsorted">
|
| <div class="firstRowBothColumn">XXXX XXXX</div>
|
| <div class="firstRowSecondColumn">XXXX XXXX</div>
|
| </div>
|
|
|
| -<div class="grid gridAutoAndAuto" id="gridAutoAndAutoUnsorted">
|
| +<div class="grid gridAutoAndAuto justifyContentStart" id="gridAutoAndAutoUnsorted">
|
| <div class="firstRowBothColumn">XXXX XXXX</div>
|
| <div class="firstRowSecondColumn">XXX</div>
|
| </div>
|
| @@ -242,18 +246,18 @@
|
| <div class="firstRowSecondColumn">XXXX XXXX</div>
|
| </div>
|
|
|
| -<div class="grid gridMaxContentFixedAndAuto" id="gridMaxContentFixedAndAutoUnsorted">
|
| +<div class="grid gridMaxContentFixedAndAuto justifyContentStart" 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="grid gridAutoMinContent justifyContentStart" 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="grid gridAutoMaxContent justifyContentStart" id="gridAutoMaxContentUnsorted">
|
| <div class="firstRowBothColumn">XXXX XXXX</div>
|
| <div class="firstRowBothColumn">XXX XXX</div>
|
| <div class="firstRowSecondColumn">XXXXX</div>
|
| @@ -274,7 +278,7 @@
|
|
|
| <!-- 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="grid gridMinContentFixedAndAuto justifyContentStart" id="gridMinContentFixedAndAutoAboveLimits">
|
| <div class="firstRowBothColumn">XXXX XXXX</div>
|
| <div class="firstRowBothColumn">XXXXXXXXXXX</div>
|
| </div>
|
| @@ -307,7 +311,7 @@
|
| <div style="grid-row: 1; grid-column: 1 / -1;">XX XX XX XX XX</div>
|
| </div>
|
|
|
| -<div class="grid gridAutoAndMinContentFixedAndMinContent" id="gridAutoAndMinContentFixedAndMinContent">
|
| +<div class="grid gridAutoAndMinContentFixedAndMinContent justifyContentStart" id="gridAutoAndMinContentFixedAndMinContent">
|
| <div style="grid-row: 1; grid-column: 1;">XX</div>
|
| <div style="grid-row: 1; grid-column: 1 / -1;">XXXXXXXXXXXXXXX</div>
|
| <div style="grid-row: 1; grid-column: 3;">XXX XXX</div>
|
|
|