| Index: third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-align.html
|
| diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-align.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-align.html
|
| index 3a473a80631e3527ae1703fa0eb637a1dc80ddca..b62806302f3750c5a35f63c271654cee6d2e280e 100644
|
| --- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-align.html
|
| +++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-align.html
|
| @@ -1,6 +1,7 @@
|
| <!DOCTYPE html>
|
| <html>
|
| <head>
|
| +<link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel="stylesheet">
|
| <link href="resources/grid.css" rel="stylesheet">
|
| <link href="resources/grid-alignment.css" rel="stylesheet">
|
| <script src="../../resources/check-layout.js"></script>
|
| @@ -12,7 +13,6 @@ body {
|
| .grid {
|
| grid-template-columns: 100px 100px;
|
| grid-template-rows: 200px 200px;
|
| - width: -webkit-fit-content;
|
| margin-bottom: 20px;
|
| }
|
|
|
| @@ -34,7 +34,7 @@ body {
|
| <p>This test checks that the align-self property is applied correctly.</p>
|
|
|
| <div style="position: relative">
|
| - <div class="grid" data-expected-width="200" data-expected-height="400">
|
| + <div class="grid fit-content" data-expected-width="200" data-expected-height="400">
|
| <div class="alignSelfStretch firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="200"></div>
|
| <div class="cell alignSelfStart firstRowSecondColumn" data-offset-x="100" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="cell alignSelfEnd firstRowSecondColumn" data-offset-x="100" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
|
| @@ -45,7 +45,7 @@ body {
|
| </div>
|
|
|
| <div style="position: relative">
|
| - <div class="grid" data-expected-width="200" data-expected-height="400">
|
| + <div class="grid fit-content" data-expected-width="200" data-expected-height="400">
|
| <div class="cell alignSelfFlexEnd firstRowFirstColumn" data-offset-x="0" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="cell alignSelfFlexStart firstRowSecondColumn" data-offset-x="100" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="cell alignSelfSelfStart secondRowFirstColumn" data-offset-x="0" data-offset-y="200" data-expected-width="20" data-expected-height="40"></div>
|
| @@ -55,7 +55,7 @@ body {
|
|
|
| <!-- Default alignment and initial values. -->
|
| <div style="position: relative">
|
| - <div class="grid alignItemsCenter" data-expected-width="200" data-expected-height="400">
|
| + <div class="grid fit-content alignItemsCenter" data-expected-width="200" data-expected-height="400">
|
| <div class="cell alignSelfAuto firstRowFirstColumn" data-offset-x="0" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="cell firstRowSecondColumn" data-offset-x="100" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="cell alignSelfSelfStart secondRowFirstColumn" data-offset-x="0" data-offset-y="200" data-expected-width="20" data-expected-height="40"></div>
|
| @@ -64,7 +64,7 @@ body {
|
| </div>
|
|
|
| <div style="position: relative">
|
| - <div class="grid" data-expected-width="200" data-expected-height="400">
|
| + <div class="grid fit-content" data-expected-width="200" data-expected-height="400">
|
| <div class="alignSelfAuto firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="200"></div>
|
| <div class="cell firstRowSecondColumn" data-offset-x="100" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="cell alignSelfStart secondRowFirstColumn" data-offset-x="0" data-offset-y="200" data-expected-width="20" data-expected-height="40"></div>
|
| @@ -74,7 +74,7 @@ body {
|
|
|
| <!-- RTL direction (it should not affect the block-flow direction). -->
|
| <div style="position: relative">
|
| - <div class="grid directionRTL" data-expected-width="200" data-expected-height="400">
|
| + <div class="grid fit-content directionRTL" data-expected-width="200" data-expected-height="400">
|
| <div class="alignSelfStretch firstRowFirstColumn" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="200"></div>
|
| <div class="cell alignSelfStart firstRowSecondColumn" data-offset-x="80" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="cell alignSelfEnd firstRowSecondColumn" data-offset-x="80" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
|
| @@ -85,7 +85,7 @@ body {
|
| </div>
|
|
|
| <div style="position: relative">
|
| - <div class="grid directionRTL" data-expected-width="200" data-expected-height="400">
|
| + <div class="grid fit-content directionRTL" data-expected-width="200" data-expected-height="400">
|
| <div class="cell alignSelfFlexEnd firstRowFirstColumn" data-offset-x="180" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="cell alignSelfFlexStart firstRowSecondColumn" data-offset-x="80" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="cell alignSelfSelfStart secondRowFirstColumn" data-offset-x="180" data-offset-y="200" data-expected-width="20" data-expected-height="40"></div>
|
| @@ -95,7 +95,7 @@ body {
|
|
|
| <!-- RTL direction (it should not affect the block-flow) with opposite directions grid container vs grid item. -->
|
| <div style="position: relative">
|
| - <div class="grid" data-expected-width="200" data-expected-height="400">
|
| + <div class="grid fit-content" data-expected-width="200" data-expected-height="400">
|
| <div class="alignSelfStretch firstRowFirstColumn directionRTL" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="200"></div>
|
| <div class="cell alignSelfStart firstRowSecondColumn directionRTL" data-offset-x="100" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="cell alignSelfEnd firstRowSecondColumn directionRTL" data-offset-x="100" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
|
| @@ -106,7 +106,7 @@ body {
|
| </div>
|
|
|
| <div style="position: relative">
|
| - <div class="grid" data-expected-width="200" data-expected-height="400">
|
| + <div class="grid fit-content" data-expected-width="200" data-expected-height="400">
|
| <div class="cell alignSelfFlexEnd firstRowFirstColumn directionRTL" data-offset-x="0" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="cell alignSelfFlexStart firstRowSecondColumn directionRTL" data-offset-x="100" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="cell alignSelfSelfStart secondRowFirstColumn directionRTL" data-offset-x="0" data-offset-y="200" data-expected-width="20" data-expected-height="40"></div>
|
| @@ -116,7 +116,7 @@ body {
|
|
|
| <!-- Vertical RL writing mode. -->
|
| <div style="position: relative">
|
| - <div class="grid verticalRL" data-expected-width="400" data-expected-height="200">
|
| + <div class="grid fit-content verticalRL" data-expected-width="400" data-expected-height="200">
|
| <div class="alignSelfStretch firstRowFirstColumn" data-offset-x="200" data-offset-y="0" data-expected-width="200" data-expected-height="100"></div>
|
| <div class="cell alignSelfStart firstRowSecondColumn" data-offset-x="380" data-offset-y="100" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="cell alignSelfEnd firstRowSecondColumn" data-offset-x="200" data-offset-y="100" data-expected-width="20" data-expected-height="40"></div>
|
| @@ -127,7 +127,7 @@ body {
|
| </div>
|
|
|
| <div style="position: relative">
|
| - <div class="grid verticalRL" data-expected-width="400" data-expected-height="200">
|
| + <div class="grid fit-content verticalRL" data-expected-width="400" data-expected-height="200">
|
| <div class="cell alignSelfFlexEnd firstRowFirstColumn" data-offset-x="200" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="cell alignSelfFlexStart firstRowSecondColumn" data-offset-x="380" data-offset-y="100" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="cell alignSelfSelfStart secondRowFirstColumn" data-offset-x="180" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
|
| @@ -137,7 +137,7 @@ body {
|
|
|
| <!-- Vertical LR writing mode. -->
|
| <div style="position: relative">
|
| - <div class="grid verticalLR" data-expected-width="400" data-expected-height="200">
|
| + <div class="grid fit-content verticalLR" data-expected-width="400" data-expected-height="200">
|
| <div class="alignSelfStretch firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="200" data-expected-height="100"></div>
|
| <div class="cell alignSelfStart firstRowSecondColumn" data-offset-x="0" data-offset-y="100" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="cell alignSelfEnd firstRowSecondColumn" data-offset-x="180" data-offset-y="100" data-expected-width="20" data-expected-height="40"></div>
|
| @@ -148,7 +148,7 @@ body {
|
| </div>
|
|
|
| <div style="position: relative">
|
| - <div class="grid verticalLR" data-expected-width="400" data-expected-height="200">
|
| + <div class="grid fit-content verticalLR" data-expected-width="400" data-expected-height="200">
|
| <div class="cell alignSelfFlexEnd firstRowFirstColumn" data-offset-x="180" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="cell alignSelfFlexStart firstRowSecondColumn" data-offset-x="0" data-offset-y="100" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="cell alignSelfSelfStart secondRowFirstColumn" data-offset-x="200" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
|
| @@ -158,7 +158,7 @@ body {
|
|
|
| <!-- Vertical RL writing mode with opposite block-flow directions grid container vs grid item. -->
|
| <div style="position: relative">
|
| - <div class="grid verticalRL" data-expected-width="400" data-expected-height="200">
|
| + <div class="grid fit-content verticalRL" data-expected-width="400" data-expected-height="200">
|
| <div class="alignSelfStretch firstRowFirstColumn verticalLR" data-offset-x="200" data-offset-y="0" data-expected-width="200" data-expected-height="100">
|
| </div>
|
| <div class="cell alignSelfStart firstRowSecondColumn verticalLR" data-offset-x="380" data-offset-y="100" data-expected-width="20" data-expected-height="40">
|
| @@ -180,7 +180,7 @@ body {
|
| </div>
|
|
|
| <div style="position: relative">
|
| - <div class="grid verticalRL" data-expected-width="400" data-expected-height="200">
|
| + <div class="grid fit-content verticalRL" data-expected-width="400" data-expected-height="200">
|
| <div class="cell alignSelfFlexEnd firstRowFirstColumn verticalLR" data-offset-x="200" data-offset-y="0" data-expected-width="20" data-expected-height="40">
|
| <div class="item"></div>
|
| </div>
|
| @@ -198,7 +198,7 @@ body {
|
|
|
| <!-- Vertical LR writing mode with opposite block-flow directions grid container vs grid item. -->
|
| <div style="position: relative">
|
| - <div class="grid verticalLR" data-expected-width="400" data-expected-height="200">
|
| + <div class="grid fit-content verticalLR" data-expected-width="400" data-expected-height="200">
|
| <div class="alignSelfStretch firstRowFirstColumn verticalRL" data-offset-x="0" data-offset-y="0" data-expected-width="200" data-expected-height="100">
|
| </div>
|
| <div class="cell alignSelfStart firstRowSecondColumn verticalRL" data-offset-x="0" data-offset-y="100" data-expected-width="20" data-expected-height="40">
|
| @@ -220,7 +220,7 @@ body {
|
| </div>
|
|
|
| <div style="position: relative">
|
| - <div class="grid verticalLR" data-expected-width="400" data-expected-height="200">
|
| + <div class="grid fit-content verticalLR" data-expected-width="400" data-expected-height="200">
|
| <div class="cell alignSelfFlexEnd firstRowFirstColumn verticalRL" data-offset-x="180" data-offset-y="0" data-expected-width="20" data-expected-height="40">
|
| <div class="item"></div>
|
| </div>
|
|
|