| Index: third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-align-justify-stretch.html
|
| diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-align-justify-stretch.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-align-justify-stretch.html
|
| index 560519e81ade4420f31471c1680504e1b10e8d37..f1db0f26770d3ba66c6c345fef1979c07a343fff 100644
|
| --- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-align-justify-stretch.html
|
| +++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-align-justify-stretch.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">
|
| <script src="../../resources/check-layout.js"></script>
|
| <style>
|
| @@ -11,7 +12,6 @@ body {
|
| .grid {
|
| grid-template-columns: 100px 100px;
|
| grid-template-rows: 200px 200px;
|
| - width: -webkit-fit-content;
|
| margin-bottom: 20px;
|
| }
|
|
|
| @@ -98,7 +98,7 @@ body {
|
| <p>This test checks that the 'stretch' value is applied correctly for 'align' and 'justify' properties.</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 justifySelfStart firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="0" data-expected-height="200"></div>
|
| <div class="widthAndHeightSet alignSelfStretch justifySelfStart firstRowSecondColumn" data-offset-x="100" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="onlyWidthSet alignSelfStretch justifySelfStart secondRowFirstColumn" data-offset-x="0" data-offset-y="200" data-expected-width="20" data-expected-height="200"></div>
|
| @@ -107,7 +107,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="alignSelfStart justifySelfStretch firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="0"></div>
|
| <div class="widthAndHeightSet alignSelfStart justifySelfStretch firstRowSecondColumn" data-offset-x="100" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="onlyWidthSet alignSelfStart justifySelfStretch secondRowFirstColumn" data-offset-x="0" data-offset-y="200" data-expected-width="20" data-expected-height="0"></div>
|
| @@ -116,7 +116,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="maxHeight alignSelfStretch justifySelfStart firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="0" data-expected-height="160"></div>
|
| <div class="minWidth widthAndHeightSet alignSelfStretch justifySelfStart firstRowSecondColumn" data-offset-x="100" data-offset-y="0" data-expected-width="120" data-expected-height="40"></div>
|
| <div class="minHeight onlyWidthSet alignSelfStretch justifySelfStart secondRowFirstColumn" data-offset-x="0" data-offset-y="200" data-expected-width="20" data-expected-height="220"></div>
|
| @@ -125,7 +125,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="alignSelfStretch justifySelfStretch firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="200"></div>
|
| <div class="widthAndHeightSet alignSelfStretch justifySelfStretch firstRowSecondColumn" data-offset-x="100" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="onlyWidthSet alignSelfStretch justifySelfStretch secondRowFirstColumn" data-offset-x="0" data-offset-y="200" data-expected-width="20" data-expected-height="200"></div>
|
| @@ -134,7 +134,7 @@ body {
|
| </div>
|
|
|
| <div style="position: relative">
|
| - <div class="grid alignItemsStretch justifyItemsStart" data-expected-width="200" data-expected-height="400">
|
| + <div class="grid fit-content alignItemsStretch justifyItemsStart" data-expected-width="200" data-expected-height="400">
|
| <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="0" data-expected-height="200"></div>
|
| <div class="widthAndHeightSet firstRowSecondColumn" data-offset-x="100" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="onlyWidthSet secondRowFirstColumn" data-offset-x="0" data-offset-y="200" data-expected-width="20" data-expected-height="200"></div>
|
| @@ -143,7 +143,7 @@ body {
|
| </div>
|
|
|
| <div style="position: relative">
|
| - <div class="grid alignItemsStart justifyItemsStretch" data-expected-width="200" data-expected-height="400">
|
| + <div class="grid fit-content alignItemsStart justifyItemsStretch" data-expected-width="200" data-expected-height="400">
|
| <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="0"></div>
|
| <div class="widthAndHeightSet firstRowSecondColumn" data-offset-x="100" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="onlyWidthSet secondRowFirstColumn" data-offset-x="0" data-offset-y="200" data-expected-width="20" data-expected-height="0"></div>
|
| @@ -152,7 +152,7 @@ body {
|
| </div>
|
|
|
| <div style="position: relative">
|
| - <div class="grid alignItemsStretch justifyItemsStretch" data-expected-width="200" data-expected-height="400">
|
| + <div class="grid fit-content alignItemsStretch justifyItemsStretch" data-expected-width="200" data-expected-height="400">
|
| <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="200"></div>
|
| <div class="widthAndHeightSet firstRowSecondColumn" data-offset-x="100" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="onlyWidthSet secondRowFirstColumn" data-offset-x="0" data-offset-y="200" data-expected-width="20" data-expected-height="200"></div>
|
| @@ -161,7 +161,7 @@ body {
|
| </div>
|
|
|
| <div style="position: relative">
|
| - <div class="grid alignItemsAuto justifyItemsAuto" data-expected-width="200" data-expected-height="400">
|
| + <div class="grid fit-content alignItemsAuto justifyItemsAuto" data-expected-width="200" data-expected-height="400">
|
| <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="200"></div>
|
| <div class="widthAndHeightSet firstRowSecondColumn" data-offset-x="100" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="onlyWidthSet secondRowFirstColumn" data-offset-x="0" data-offset-y="200" data-expected-width="20" data-expected-height="200"></div>
|
| @@ -170,7 +170,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="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="200"></div>
|
| <div class="widthAndHeightSet firstRowSecondColumn" data-offset-x="100" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="onlyWidthSet secondRowFirstColumn" data-offset-x="0" data-offset-y="200" data-expected-width="20" data-expected-height="200"></div>
|
| @@ -179,7 +179,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="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="200"></div>
|
| <div class="firstRowSecondColumn" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="200"></div>
|
| <div class="secondRowFirstColumn" data-offset-x="0" data-offset-y="200" data-expected-width="100" data-expected-height="200"></div>
|
| @@ -189,7 +189,7 @@ body {
|
|
|
| <!-- RTL direction (it should not affect the block-flow direction). -->
|
| <div style="position: relative">
|
| - <div class="grid directionRTL alignItemsStretch justifyItemsStretch" data-expected-width="200" data-expected-height="400">
|
| + <div class="grid fit-content directionRTL alignItemsStretch justifyItemsStretch" data-expected-width="200" data-expected-height="400">
|
| <div class="firstRowFirstColumn" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="200"></div>
|
| <div class="widthAndHeightSet firstRowSecondColumn" data-offset-x="80" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="onlyWidthSet secondRowFirstColumn" data-offset-x="180" data-offset-y="200" data-expected-width="20" data-expected-height="200"></div>
|
| @@ -199,7 +199,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 alignItemsStretch justifyItemsStretch" data-expected-width="200" data-expected-height="400">
|
| + <div class="grid fit-content alignItemsStretch justifyItemsStretch" data-expected-width="200" data-expected-height="400">
|
| <div class="firstRowFirstColumn directionRTL" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="200"></div>
|
| <div class="widthAndHeightSet firstRowSecondColumn directionRTL" data-offset-x="100" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="onlyWidthSet secondRowFirstColumn directionRTL" data-offset-x="0" data-offset-y="200" data-expected-width="20" data-expected-height="200"></div>
|
| @@ -209,7 +209,7 @@ body {
|
|
|
| <!-- Vertical RL writing mode. -->
|
| <div style="position: relative">
|
| - <div class="grid verticalRL alignItemsStretch justifyItemsStretch" data-expected-width="400" data-expected-height="200">
|
| + <div class="grid fit-content verticalRL alignItemsStretch justifyItemsStretch" data-expected-width="400" data-expected-height="200">
|
| <div class="firstRowFirstColumn" data-offset-x="200" data-offset-y="0" data-expected-width="200" data-expected-height="100"></div>
|
| <div class="widthAndHeightSet firstRowSecondColumn" data-offset-x="380" data-offset-y="100" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="onlyWidthSet secondRowFirstColumn" data-offset-x="180" data-offset-y="0" data-expected-width="20" data-expected-height="100"></div>
|
| @@ -218,7 +218,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="firstRowFirstColumn" data-offset-x="200" data-offset-y="0" data-expected-width="200" data-expected-height="100"></div>
|
| <div class="firstRowSecondColumn" data-offset-x="200" data-offset-y="100" data-expected-width="200" data-expected-height="100"></div>
|
| <div class="secondRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="200" data-expected-height="100"></div>
|
| @@ -228,7 +228,7 @@ body {
|
|
|
| <!-- Vertical LR writing mode. -->
|
| <div style="position: relative">
|
| - <div class="grid verticalLR alignItemsStretch justifyItemsStretch" data-expected-width="400" data-expected-height="200">
|
| + <div class="grid fit-content verticalLR alignItemsStretch justifyItemsStretch" data-expected-width="400" data-expected-height="200">
|
| <div class="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="200" data-expected-height="100"></div>
|
| <div class="widthAndHeightSet firstRowSecondColumn" data-offset-x="0" data-offset-y="100" data-expected-width="20" data-expected-height="40"></div>
|
| <div class="onlyWidthSet secondRowFirstColumn" data-offset-x="200" data-offset-y="0" data-expected-width="20" data-expected-height="100"></div>
|
| @@ -237,7 +237,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="firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="200" data-expected-height="100"></div>
|
| <div class="firstRowSecondColumn" data-offset-x="0" data-offset-y="100" data-expected-width="200" data-expected-height="100"></div>
|
| <div class="secondRowFirstColumn" data-offset-x="200" data-offset-y="0" data-expected-width="200" data-expected-height="100"></div>
|
|
|