Diff
Modified: trunk/LayoutTests/ChangeLog (256444 => 256445)
--- trunk/LayoutTests/ChangeLog 2020-02-12 18:02:37 UTC (rev 256444)
+++ trunk/LayoutTests/ChangeLog 2020-02-12 18:03:55 UTC (rev 256445)
@@ -1,3 +1,20 @@
+2020-02-12 Rossana Monteriso <[email protected]>
+
+ [css-grid] Move grid-item-auto-margins-alignment tests to WPT folder
+ https://bugs.webkit.org/show_bug.cgi?id=207534
+
+ Reviewed by Javier Fernandez.
+
+ Remove grid-item-auto-margins-alignment tests and their expected.txt files. These tests
+ are being replaced by adapted tests in the corresponding WPT test folder.
+
+ * fast/css-grid-layout/grid-item-auto-margins-alignment-expected.txt: Removed.
+ * fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr-expected.txt: Removed.
+ * fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl-expected.txt: Removed.
+ * fast/css-grid-layout/grid-item-auto-margins-alignment.html: Removed.
+ * fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr.html: Removed.
+ * fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl.html: Removed.
+
2020-02-12 Jacob Uphoff <[email protected]>
[ macOS wk2 ] webgpu/whlsl/whlsl.html
Deleted: trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-expected.txt (256444 => 256445)
--- trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-expected.txt 2020-02-12 18:02:37 UTC (rev 256444)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-expected.txt 2020-02-12 18:03:55 UTC (rev 256445)
@@ -1,26 +0,0 @@
-This test checks that aling-self and justify-self properties are not applied when there is auto-margin in the correponding axis. Instead, auto-margin alignment should be applied.
-
-Direction: LTR | Self Aligmment: center | fixed size items | 1 auto-margin
-
-PASS
-Direction: LTR | Self Aligmment: start | fixed size items | 4 auto-margin
-
-PASS
-Direction: LTR | Self Aligmment: center | auto size items | 1 auto-margin
-
-PASS
-Direction: LTR | Self Aligmment: start | auto size items | 4 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: center | fixed size items | 1 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: start | fixed size items | 4 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: center | auto size items | 1 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: start | auto size items | 4 auto-margin
-
-PASS
Deleted: trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr-expected.txt (256444 => 256445)
--- trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr-expected.txt 2020-02-12 18:02:37 UTC (rev 256444)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr-expected.txt 2020-02-12 18:03:55 UTC (rev 256445)
@@ -1,26 +0,0 @@
-This test checks that aling-self and justify-self properties are not applied when there is auto-margin in the correponding axis. Instead, auto-margin alignment should be applied.
-
-Direction: LTR | Self Aligmment: center | fixed size items | 1 auto-margin
-
-PASS
-Direction: LTR | Self Aligmment: start | fixed size items | 4 auto-margin
-
-PASS
-Direction: LTR | Self Aligmment: center | auto size items | 1 auto-margin
-
-PASS
-Direction: LTR | Self Aligmment: start | auto size items | 4 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: center | fixed size items | 1 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: start | fixed size items | 4 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: center | auto size items | 1 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: start | auto size items | 4 auto-margin
-
-PASS
Deleted: trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr.html (256444 => 256445)
--- trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr.html 2020-02-12 18:02:37 UTC (rev 256444)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr.html 2020-02-12 18:03:55 UTC (rev 256445)
@@ -1,119 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<link href="" rel="stylesheet">
-<link href="" rel="stylesheet">
-<link href="" rel="stylesheet">
-<script src=""
-<style>
-body {
- margin: 0;
-}
-
-.grid {
- grid-template-columns: 100px 100px;
- grid-template-rows: 200px 200px;
- margin-bottom: 20px;
-}
-
-.item {
- width: 20px;
- height: 40px;
-}
-
-.autoMarginTop { margin-top: auto; }
-.autoMarginRight { margin-right: auto; }
-.autoMarginBottom { margin-bottom: auto; }
-.autoMarginLeft { margin-left: auto; }
-.autoMargin { margin: auto; }
-</style>
-</head>
-<body _onload_="checkLayout('.grid')">
-
-<p>This test checks that aling-self and justify-self properties are not applied when there is auto-margin in the correponding axis. Instead, auto-margin alignment should be applied.</p>
-
-<p>Direction: LTR | Self Aligmment: center | fixed size items | 1 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content verticalLR itemsCenter">
- <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="90" data-offset-y="60" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMarginRight firstRowSecondColumn" data-offset-x="0" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMarginLeft secondRowFirstColumn" data-offset-x="380" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMarginBottom secondRowSecondColumn" data-offset-x="290" data-offset-y="100" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<p>Direction: LTR | Self Aligmment: start | fixed size items | 4 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content verticalLR">
- <div class="item autoMargin firstRowFirstColumn" data-offset-x="90" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMargin firstRowSecondColumn" data-offset-x="90" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMargin secondRowFirstColumn" data-offset-x="290" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMargin secondRowSecondColumn" data-offset-x="290" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<p>Direction: LTR | Self Aligmment: center | auto size items | 1 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content verticalLR itemsCenter">
- <div class="autoMarginTop firstRowFirstColumn" data-offset-x="90" data-offset-y="60" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMarginRight firstRowSecondColumn" data-offset-x="0" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMarginLeft secondRowFirstColumn" data-offset-x="380" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMarginBottom secondRowSecondColumn" data-offset-x="290" data-offset-y="100" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- </div>
-</div>
-
-<p>Direction: LTR | Self Aligmment: start | auto size items | 4 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content verticalLR">
- <div class="autoMargin firstRowFirstColumn" data-offset-x="90" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMargin firstRowSecondColumn" data-offset-x="90" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMargin secondRowFirstColumn" data-offset-x="290" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMargin secondRowSecondColumn" data-offset-x="290" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- </div>
-</div>
-
-<!-- direction RTL -->
-<p>Direction: RTL | Self Aligmment: center | fixed size items | 1 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content verticalLR itemsCenter directionRTL">
- <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="90" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMarginRight firstRowSecondColumn" data-offset-x="0" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMarginLeft secondRowFirstColumn" data-offset-x="380" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMarginBottom secondRowSecondColumn" data-offset-x="290" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-
-<p>Direction: RTL | Self Aligmment: start | fixed size items | 4 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content verticalLR directionRTL">
- <div class="item autoMargin firstRowFirstColumn" data-offset-x="90" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMargin firstRowSecondColumn" data-offset-x="90" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMargin secondRowFirstColumn" data-offset-x="290" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMargin secondRowSecondColumn" data-offset-x="290" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<p>Direction: RTL | Self Aligmment: center | auto size items | 1 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content verticalLR itemsCenter directionRTL">
- <div class="autoMarginTop firstRowFirstColumn" data-offset-x="90" data-offset-y="160" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMarginRight firstRowSecondColumn" data-offset-x="0" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMarginLeft secondRowFirstColumn" data-offset-x="380" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMarginBottom secondRowSecondColumn" data-offset-x="290" data-offset-y="0" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- </div>
-</div>
-
-
-<p>Direction: RTL | Self Aligmment: start | auto size items | 4 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content verticalLR directionRTL">
- <div class="autoMargin firstRowFirstColumn" data-offset-x="90" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMargin firstRowSecondColumn" data-offset-x="90" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMargin secondRowFirstColumn" data-offset-x="290" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMargin secondRowSecondColumn" data-offset-x="290" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- </div>
-</div>
-
-</body>
-</html>
Deleted: trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl-expected.txt (256444 => 256445)
--- trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl-expected.txt 2020-02-12 18:02:37 UTC (rev 256444)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl-expected.txt 2020-02-12 18:03:55 UTC (rev 256445)
@@ -1,26 +0,0 @@
-This test checks that aling-self and justify-self properties are not applied when there is auto-margin in the correponding axis. Instead, auto-margin alignment should be applied.
-
-Direction: LTR | Self Aligmment: center | fixed size items | 1 auto-margin
-
-PASS
-Direction: LTR | Self Aligmment: start | fixed size items | 4 auto-margin
-
-PASS
-Direction: LTR | Self Aligmment: center | auto size items | 1 auto-margin
-
-PASS
-Direction: LTR | Self Aligmment: start | auto size items | 4 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: center | fixed size items | 1 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: start | fixed size items | 4 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: center | auto size items | 1 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: start | auto size items | 4 auto-margin
-
-PASS
Deleted: trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl.html (256444 => 256445)
--- trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl.html 2020-02-12 18:02:37 UTC (rev 256444)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl.html 2020-02-12 18:03:55 UTC (rev 256445)
@@ -1,119 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<link href="" rel="stylesheet">
-<link href="" rel="stylesheet">
-<link href="" rel="stylesheet">
-<script src=""
-<style>
-body {
- margin: 0;
-}
-
-.grid {
- grid-template-columns: 100px 100px;
- grid-template-rows: 200px 200px;
- margin-bottom: 20px;
-}
-
-.item {
- width: 20px;
- height: 40px;
-}
-
-.autoMarginTop { margin-top: auto; }
-.autoMarginRight { margin-right: auto; }
-.autoMarginBottom { margin-bottom: auto; }
-.autoMarginLeft { margin-left: auto; }
-.autoMargin { margin: auto; }
-</style>
-</head>
-<body _onload_="checkLayout('.grid')">
-
-<p>This test checks that aling-self and justify-self properties are not applied when there is auto-margin in the correponding axis. Instead, auto-margin alignment should be applied.</p>
-
-<p>Direction: LTR | Self Aligmment: center | fixed size items | 1 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content verticalRL itemsCenter">
- <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="290" data-offset-y="60" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMarginRight firstRowSecondColumn" data-offset-x="200" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMarginLeft secondRowFirstColumn" data-offset-x="180" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMarginBottom secondRowSecondColumn" data-offset-x="90" data-offset-y="100" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<p>Direction: LTR | Self Aligmment: start | fixed size items | 4 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content verticalRL">
- <div class="item autoMargin firstRowFirstColumn" data-offset-x="290" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMargin firstRowSecondColumn" data-offset-x="290" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMargin secondRowFirstColumn" data-offset-x="90" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMargin secondRowSecondColumn" data-offset-x="90" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<p>Direction: LTR | Self Aligmment: center | auto size items | 1 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content verticalRL itemsCenter">
- <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="290" data-offset-y="60" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="item autoMarginRight firstRowSecondColumn" data-offset-x="200" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="item autoMarginLeft secondRowFirstColumn" data-offset-x="180" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="item autoMarginBottom secondRowSecondColumn" data-offset-x="90" data-offset-y="100" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- </div>
-</div>
-
-<p>Direction: LTR | Self Aligmment: start | auto size items | 4 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content verticalRL">
- <div class="item autoMargin firstRowFirstColumn" data-offset-x="290" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="item autoMargin firstRowSecondColumn" data-offset-x="290" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="item autoMargin secondRowFirstColumn" data-offset-x="90" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="item autoMargin secondRowSecondColumn" data-offset-x="90" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- </div>
-</div>
-
-<!-- direction RTL -->
-<p>Direction: RTL | Self Aligmment: center | fixed size items | 1 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content verticalRL itemsCenter directionRTL">
- <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="290" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMarginRight firstRowSecondColumn" data-offset-x="200" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMarginLeft secondRowFirstColumn" data-offset-x="180" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMarginBottom secondRowSecondColumn" data-offset-x="90" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-
-<p>Direction: RTL | Self Aligmment: start | fixed size items | 4 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content verticalRL directionRTL">
- <div class="item autoMargin firstRowFirstColumn" data-offset-x="290" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMargin firstRowSecondColumn" data-offset-x="290" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMargin secondRowFirstColumn" data-offset-x="90" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMargin secondRowSecondColumn" data-offset-x="90" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<p>Direction: RTL | Self Aligmment: center | auto size items | 1 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content verticalRL itemsCenter directionRTL">
- <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="290" data-offset-y="160" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="item autoMarginRight firstRowSecondColumn" data-offset-x="200" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="item autoMarginLeft secondRowFirstColumn" data-offset-x="180" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="item autoMarginBottom secondRowSecondColumn" data-offset-x="90" data-offset-y="0" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- </div>
-</div>
-
-
-<p>Direction: RTL | Self Aligmment: start | auto size items | 4 auto-margin</p>
-<div style="position: relative">
- <div class="grid verticalRL directionRTL" data-expected-width="400" data-expected-height="200">
- <div class="item autoMargin firstRowFirstColumn" data-offset-x="290" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="item autoMargin firstRowSecondColumn" data-offset-x="290" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="item autoMargin secondRowFirstColumn" data-offset-x="90" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="item autoMargin secondRowSecondColumn" data-offset-x="90" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- </div>
-</div>
-
-</body>
-</html>
Deleted: trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment.html (256444 => 256445)
--- trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment.html 2020-02-12 18:02:37 UTC (rev 256444)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment.html 2020-02-12 18:03:55 UTC (rev 256445)
@@ -1,117 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<link href="" rel="stylesheet">
-<link href="" rel="stylesheet">
-<link href="" rel="stylesheet">
-<script src=""
-<style>
-body {
- margin: 0;
-}
-
-.grid {
- grid-template-columns: 100px 100px;
- grid-template-rows: 200px 200px;
- margin-bottom: 20px;
-}
-
-.item {
- width: 20px;
- height: 40px;
-}
-
-.autoMarginTop { margin-top: auto; }
-.autoMarginRight { margin-right: auto; }
-.autoMarginBottom { margin-bottom: auto; }
-.autoMarginLeft { margin-left: auto; }
-.autoMargin { margin: auto; }
-</style>
-</head>
-<body _onload_="checkLayout('.grid')">
-
-<p>This test checks that aling-self and justify-self properties are not applied when there is auto-margin in the correponding axis. Instead, auto-margin alignment should be applied.</p>
-
-<p>Direction: LTR | Self Aligmment: center | fixed size items | 1 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content itemsCenter">
- <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="40" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMarginRight firstRowSecondColumn" data-offset-x="100" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMarginLeft secondRowFirstColumn" data-offset-x="80" data-offset-y="280" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMarginBottom secondRowSecondColumn" data-offset-x="140" data-offset-y="200" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<p>Direction: LTR | Self Aligmment: start | fixed size items | 4 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content">
- <div class="item autoMargin firstRowFirstColumn" data-offset-x="40" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMargin firstRowSecondColumn" data-offset-x="140" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMargin secondRowFirstColumn" data-offset-x="40" data-offset-y="280" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMargin secondRowSecondColumn" data-offset-x="140" data-offset-y="280" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<p>Direction: LTR | Self Aligmment: center | auto size items | 1 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content itemsCenter">
- <div class="autoMarginTop firstRowFirstColumn" data-offset-x="40" data-offset-y="160" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMarginRight firstRowSecondColumn" data-offset-x="100" data-offset-y="80" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMarginLeft secondRowFirstColumn" data-offset-x="80" data-offset-y="280" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMarginBottom secondRowSecondColumn" data-offset-x="140" data-offset-y="200" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- </div>
-</div>
-
-<p>Direction: LTR | Self Aligmment: start | auto size items | 4 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content">
- <div class="autoMargin firstRowFirstColumn" data-offset-x="40" data-offset-y="80" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMargin firstRowSecondColumn" data-offset-x="140" data-offset-y="80" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMargin secondRowFirstColumn" data-offset-x="40" data-offset-y="280" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMargin secondRowSecondColumn" data-offset-x="140" data-offset-y="280" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- </div>
-</div>
-
-<!-- direction RTL -->
-<p>Direction: RTL | Self Aligmment: center | fixed size items | 1 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content itemsCenter directionRTL">
- <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="140" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMarginRight firstRowSecondColumn" data-offset-x="0" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMarginLeft secondRowFirstColumn" data-offset-x="180" data-offset-y="280" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMarginBottom secondRowSecondColumn" data-offset-x="40" data-offset-y="200" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<p>Direction: RTL | Self Aligmment: start | fixed size items | 4 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content directionRTL">
- <div class="item autoMargin firstRowFirstColumn" data-offset-x="140" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMargin firstRowSecondColumn" data-offset-x="40" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMargin secondRowFirstColumn" data-offset-x="140" data-offset-y="280" data-expected-width="20" data-expected-height="40"></div>
- <div class="item autoMargin secondRowSecondColumn" data-offset-x="40" data-offset-y="280" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<p>Direction: RTL | Self Aligmment: center | auto size items | 1 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content itemsCenter directionRTL">
- <div class="autoMarginTop firstRowFirstColumn" data-offset-x="140" data-offset-y="160" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMarginRight firstRowSecondColumn" data-offset-x="0" data-offset-y="80" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMarginLeft secondRowFirstColumn" data-offset-x="180" data-offset-y="280" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMarginBottom secondRowSecondColumn" data-offset-x="40" data-offset-y="200" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- </div>
-</div>
-
-<p>Direction: RTL | Self Aligmment: start | auto size items | 4 auto-margin</p>
-<div style="position: relative">
- <div class="grid fit-content directionRTL">
- <div class="autoMargin firstRowFirstColumn" data-offset-x="140" data-offset-y="80" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMargin firstRowSecondColumn" data-offset-x="40" data-offset-y="80" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMargin secondRowFirstColumn" data-offset-x="140" data-offset-y="280" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- <div class="autoMargin secondRowSecondColumn" data-offset-x="40" data-offset-y="280" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
- </div>
-</div>
-
-</body>
-</html>
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (256444 => 256445)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2020-02-12 18:02:37 UTC (rev 256444)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2020-02-12 18:03:55 UTC (rev 256445)
@@ -1,3 +1,20 @@
+2020-02-12 Rossana Monteriso <[email protected]>
+
+ [css-grid] Move grid-item-auto-margins-alignment tests to WPT folder
+ https://bugs.webkit.org/show_bug.cgi?id=207534
+
+ Reviewed by Javier Fernandez.
+
+ Add grid-item-auto-margins-alignment tests, checked and adapted to WPT, with their expected.txt files.
+ Imported to WPT with this PR: https://github.com/web-platform-tests/wpt/pull/21509
+
+ * web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-expected.txt:
+ * web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-lr-expected.txt:
+ * web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-lr.html:
+ * web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-rl-expected.txt:
+ * web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-rl.html:
+ * web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment.html:
+
2020-02-11 Youenn Fablet <[email protected]>
Parent service worker controller should be used for child iframe as per https://w3c.github.io/ServiceWorker/#control-and-use-window-client
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-expected.txt (0 => 256445)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-expected.txt 2020-02-12 18:03:55 UTC (rev 256445)
@@ -0,0 +1,28 @@
+This test checks that align-self and justify-self properties are not applied when there is auto-margin in the corresponding axis. Instead, auto-margin alignment should be applied.
+
+Direction: LTR | Self Alignment: center | fixed size items | 1 auto-margin
+
+Direction: LTR | Self Alignment: start | fixed size items | 4 auto-margin
+
+Direction: LTR | Self Alignment: center | auto size items | 1 auto-margin
+
+Direction: LTR | Self Alignment: start | auto size items | 4 auto-margin
+
+Direction: RTL | Self Alignment: center | fixed size items | 1 auto-margin
+
+Direction: RTL | Self Alignment: start | fixed size items | 4 auto-margin
+
+Direction: RTL | Self Alignment: center | auto size items | 1 auto-margin
+
+Direction: RTL | Self Alignment: start | auto size items | 4 auto-margin
+
+
+PASS .grid 1
+PASS .grid 2
+PASS .grid 3
+PASS .grid 4
+PASS .grid 5
+PASS .grid 6
+PASS .grid 7
+PASS .grid 8
+
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-lr-expected.txt (0 => 256445)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-lr-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-lr-expected.txt 2020-02-12 18:03:55 UTC (rev 256445)
@@ -0,0 +1,28 @@
+This test checks that align-self and justify-self properties are not applied when there is auto-margin in the corresponding axis. Instead, auto-margin alignment should be applied.
+
+Direction: LTR | Self Alignment: center | fixed size items | 1 auto-margin
+
+Direction: LTR | Self Alignment: start | fixed size items | 4 auto-margin
+
+Direction: LTR | Self Alignment: center | auto size items | 1 auto-margin
+
+Direction: LTR | Self Alignment: start | auto size items | 4 auto-margin
+
+Direction: RTL | Self Alignment: center | fixed size items | 1 auto-margin
+
+Direction: RTL | Self Alignment: start | fixed size items | 4 auto-margin
+
+Direction: RTL | Self Alignment: center | auto size items | 1 auto-margin
+
+Direction: RTL | Self Alignment: start | auto size items | 4 auto-margin
+
+
+PASS .grid 1
+PASS .grid 2
+PASS .grid 3
+PASS .grid 4
+PASS .grid 5
+PASS .grid 6
+PASS .grid 7
+PASS .grid 8
+
Copied: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-lr.html (from rev 256444, trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr.html) (0 => 256445)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-lr.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-lr.html 2020-02-12 18:03:55 UTC (rev 256445)
@@ -0,0 +1,124 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout test: align-self and justify-self with auto margins, vertical-lr</title>
+<link rel="author" title="Rossana Monteriso" href=""
+<link rel="help" href=""
+<link rel="help" href=""
+<meta name="assert" content="This test checks that align-self and justify-self properties are not applied when there is auto-margin in the corresponding axis. Instead, auto-margin alignment should be applied, both for LTR and RTL directions, vertical-lr writing mode.">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" href=""
+<link rel="stylesheet" href=""
+<link rel="stylesheet" href=""
+<link rel="stylesheet" type="text/css" href="" />
+
+<style>
+.grid {
+ grid-template-columns: 100px 100px;
+ grid-template-rows: 200px 200px;
+ margin-bottom: 20px;
+}
+
+.item {
+ width: 20px;
+ height: 40px;
+}
+
+.autoMarginTop { margin-top: auto; }
+.autoMarginRight { margin-right: auto; }
+.autoMarginBottom { margin-bottom: auto; }
+.autoMarginLeft { margin-left: auto; }
+.autoMargin { margin: auto; }
+</style>
+
+<script src=""
+<script src=""
+<script src=""
+
+<body _onload_="checkLayout('.grid')">
+
+<p>This test checks that align-self and justify-self properties are not applied when there is auto-margin in the corresponding axis. Instead, auto-margin alignment should be applied.</p>
+
+<p>Direction: LTR | Self Alignment: center | fixed size items | 1 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content verticalLR itemsCenter">
+ <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="90" data-offset-y="60" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMarginRight firstRowSecondColumn" data-offset-x="0" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMarginLeft secondRowFirstColumn" data-offset-x="380" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMarginBottom secondRowSecondColumn" data-offset-x="290" data-offset-y="100" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<p>Direction: LTR | Self Alignment: start | fixed size items | 4 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content verticalLR">
+ <div class="item autoMargin firstRowFirstColumn" data-offset-x="90" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMargin firstRowSecondColumn" data-offset-x="90" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMargin secondRowFirstColumn" data-offset-x="290" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMargin secondRowSecondColumn" data-offset-x="290" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<p>Direction: LTR | Self Alignment: center | auto size items | 1 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content verticalLR itemsCenter">
+ <div class="autoMarginTop firstRowFirstColumn" data-offset-x="90" data-offset-y="60" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMarginRight firstRowSecondColumn" data-offset-x="0" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMarginLeft secondRowFirstColumn" data-offset-x="380" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMarginBottom secondRowSecondColumn" data-offset-x="290" data-offset-y="100" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ </div>
+</div>
+
+<p>Direction: LTR | Self Alignment: start | auto size items | 4 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content verticalLR">
+ <div class="autoMargin firstRowFirstColumn" data-offset-x="90" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMargin firstRowSecondColumn" data-offset-x="90" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMargin secondRowFirstColumn" data-offset-x="290" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMargin secondRowSecondColumn" data-offset-x="290" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ </div>
+</div>
+
+<!-- direction RTL -->
+<p>Direction: RTL | Self Alignment: center | fixed size items | 1 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content verticalLR itemsCenter directionRTL">
+ <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="90" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMarginRight firstRowSecondColumn" data-offset-x="0" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMarginLeft secondRowFirstColumn" data-offset-x="380" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMarginBottom secondRowSecondColumn" data-offset-x="290" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+
+<p>Direction: RTL | Self Alignment: start | fixed size items | 4 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content verticalLR directionRTL">
+ <div class="item autoMargin firstRowFirstColumn" data-offset-x="90" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMargin firstRowSecondColumn" data-offset-x="90" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMargin secondRowFirstColumn" data-offset-x="290" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMargin secondRowSecondColumn" data-offset-x="290" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<p>Direction: RTL | Self Alignment: center | auto size items | 1 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content verticalLR itemsCenter directionRTL">
+ <div class="autoMarginTop firstRowFirstColumn" data-offset-x="90" data-offset-y="160" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMarginRight firstRowSecondColumn" data-offset-x="0" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMarginLeft secondRowFirstColumn" data-offset-x="380" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMarginBottom secondRowSecondColumn" data-offset-x="290" data-offset-y="0" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ </div>
+</div>
+
+
+<p>Direction: RTL | Self Alignment: start | auto size items | 4 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content verticalLR directionRTL">
+ <div class="autoMargin firstRowFirstColumn" data-offset-x="90" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMargin firstRowSecondColumn" data-offset-x="90" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMargin secondRowFirstColumn" data-offset-x="290" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMargin secondRowSecondColumn" data-offset-x="290" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ </div>
+</div>
+
+</body>
\ No newline at end of file
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-rl-expected.txt (0 => 256445)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-rl-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-rl-expected.txt 2020-02-12 18:03:55 UTC (rev 256445)
@@ -0,0 +1,28 @@
+This test checks that align-self and justify-self properties are not applied when there is auto-margin in the corresponding axis. Instead, auto-margin alignment should be applied.
+
+Direction: LTR | Self Alignment: center | fixed size items | 1 auto-margin
+
+Direction: LTR | Self Alignment: start | fixed size items | 4 auto-margin
+
+Direction: LTR | Self Alignment: center | auto size items | 1 auto-margin
+
+Direction: LTR | Self Alignment: start | auto size items | 4 auto-margin
+
+Direction: RTL | Self Alignment: center | fixed size items | 1 auto-margin
+
+Direction: RTL | Self Alignment: start | fixed size items | 4 auto-margin
+
+Direction: RTL | Self Alignment: center | auto size items | 1 auto-margin
+
+Direction: RTL | Self Alignment: start | auto size items | 4 auto-margin
+
+
+PASS .grid 1
+PASS .grid 2
+PASS .grid 3
+PASS .grid 4
+PASS .grid 5
+PASS .grid 6
+PASS .grid 7
+PASS .grid 8
+
Copied: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-rl.html (from rev 256444, trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl.html) (0 => 256445)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-rl.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-rl.html 2020-02-12 18:03:55 UTC (rev 256445)
@@ -0,0 +1,124 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout test: align-self and justify-self with auto margins, vertical-rl</title>
+<link rel="author" title="Rossana Monteriso" href=""
+<link rel="help" href=""
+<link rel="help" href=""
+<meta name="assert" content="This test checks that align-self and justify-self properties are not applied when there is auto-margin in the corresponding axis. Instead, auto-margin alignment should be applied, both for LTR and RTL directions, vertical-rl writing mode.">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" href=""
+<link rel="stylesheet" href=""
+<link rel="stylesheet" href=""
+<link rel="stylesheet" type="text/css" href="" />
+
+<style>
+.grid {
+ grid-template-columns: 100px 100px;
+ grid-template-rows: 200px 200px;
+ margin-bottom: 20px;
+}
+
+.item {
+ width: 20px;
+ height: 40px;
+}
+
+.autoMarginTop { margin-top: auto; }
+.autoMarginRight { margin-right: auto; }
+.autoMarginBottom { margin-bottom: auto; }
+.autoMarginLeft { margin-left: auto; }
+.autoMargin { margin: auto; }
+</style>
+
+<script src=""
+<script src=""
+<script src=""
+
+<body _onload_="checkLayout('.grid')">
+
+<p>This test checks that align-self and justify-self properties are not applied when there is auto-margin in the corresponding axis. Instead, auto-margin alignment should be applied.</p>
+
+<p>Direction: LTR | Self Alignment: center | fixed size items | 1 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content verticalRL itemsCenter">
+ <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="290" data-offset-y="60" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMarginRight firstRowSecondColumn" data-offset-x="200" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMarginLeft secondRowFirstColumn" data-offset-x="180" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMarginBottom secondRowSecondColumn" data-offset-x="90" data-offset-y="100" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<p>Direction: LTR | Self Alignment: start | fixed size items | 4 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content verticalRL">
+ <div class="item autoMargin firstRowFirstColumn" data-offset-x="290" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMargin firstRowSecondColumn" data-offset-x="290" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMargin secondRowFirstColumn" data-offset-x="90" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMargin secondRowSecondColumn" data-offset-x="90" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<p>Direction: LTR | Self Alignment: center | auto size items | 1 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content verticalRL itemsCenter">
+ <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="290" data-offset-y="60" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="item autoMarginRight firstRowSecondColumn" data-offset-x="200" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="item autoMarginLeft secondRowFirstColumn" data-offset-x="180" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="item autoMarginBottom secondRowSecondColumn" data-offset-x="90" data-offset-y="100" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ </div>
+</div>
+
+<p>Direction: LTR | Self Alignment: start | auto size items | 4 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content verticalRL">
+ <div class="item autoMargin firstRowFirstColumn" data-offset-x="290" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="item autoMargin firstRowSecondColumn" data-offset-x="290" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="item autoMargin secondRowFirstColumn" data-offset-x="90" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="item autoMargin secondRowSecondColumn" data-offset-x="90" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ </div>
+</div>
+
+<!-- direction RTL -->
+<p>Direction: RTL | Self Alignment: center | fixed size items | 1 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content verticalRL itemsCenter directionRTL">
+ <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="290" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMarginRight firstRowSecondColumn" data-offset-x="200" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMarginLeft secondRowFirstColumn" data-offset-x="180" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMarginBottom secondRowSecondColumn" data-offset-x="90" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+
+<p>Direction: RTL | Self Alignment: start | fixed size items | 4 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content verticalRL directionRTL">
+ <div class="item autoMargin firstRowFirstColumn" data-offset-x="290" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMargin firstRowSecondColumn" data-offset-x="290" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMargin secondRowFirstColumn" data-offset-x="90" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMargin secondRowSecondColumn" data-offset-x="90" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<p>Direction: RTL | Self Alignment: center | auto size items | 1 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content verticalRL itemsCenter directionRTL">
+ <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="290" data-offset-y="160" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="item autoMarginRight firstRowSecondColumn" data-offset-x="200" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="item autoMarginLeft secondRowFirstColumn" data-offset-x="180" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="item autoMarginBottom secondRowSecondColumn" data-offset-x="90" data-offset-y="0" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ </div>
+</div>
+
+
+<p>Direction: RTL | Self Alignment: start | auto size items | 4 auto-margin</p>
+<div style="position: relative">
+ <div class="grid verticalRL directionRTL" data-expected-width="400" data-expected-height="200">
+ <div class="item autoMargin firstRowFirstColumn" data-offset-x="290" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="item autoMargin firstRowSecondColumn" data-offset-x="290" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="item autoMargin secondRowFirstColumn" data-offset-x="90" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="item autoMargin secondRowSecondColumn" data-offset-x="90" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ </div>
+</div>
+
+</body>
\ No newline at end of file
Copied: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment.html (from rev 256444, trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment.html) (0 => 256445)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment.html 2020-02-12 18:03:55 UTC (rev 256445)
@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout test: align-self and justify-self with auto margins</title>
+<link rel="author" title="Rossana Monteriso" href=""
+<link rel="help" href=""
+<link rel="help" href=""
+<meta name="assert" content="This test checks that align-self and justify-self properties are not applied when there is auto-margin in the corresponding axis. Instead, auto-margin alignment should be applied, both for LTR and RTL directions.">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" href=""
+<link rel="stylesheet" href=""
+<link rel="stylesheet" href=""
+<link rel="stylesheet" type="text/css" href="" />
+
+<style>
+.grid {
+ grid-template-columns: 100px 100px;
+ grid-template-rows: 200px 200px;
+ margin-bottom: 20px;
+}
+
+.item {
+ width: 20px;
+ height: 40px;
+}
+
+.autoMarginTop { margin-top: auto; }
+.autoMarginRight { margin-right: auto; }
+.autoMarginBottom { margin-bottom: auto; }
+.autoMarginLeft { margin-left: auto; }
+.autoMargin { margin: auto; }
+</style>
+
+<script src=""
+<script src=""
+<script src=""
+
+<body _onload_="checkLayout('.grid')">
+
+<p>This test checks that align-self and justify-self properties are not applied when there is auto-margin in the corresponding axis. Instead, auto-margin alignment should be applied.</p>
+
+<p>Direction: LTR | Self Alignment: center | fixed size items | 1 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content itemsCenter">
+ <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="40" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMarginRight firstRowSecondColumn" data-offset-x="100" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMarginLeft secondRowFirstColumn" data-offset-x="80" data-offset-y="280" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMarginBottom secondRowSecondColumn" data-offset-x="140" data-offset-y="200" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<p>Direction: LTR | Self Alignment: start | fixed size items | 4 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content">
+ <div class="item autoMargin firstRowFirstColumn" data-offset-x="40" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMargin firstRowSecondColumn" data-offset-x="140" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMargin secondRowFirstColumn" data-offset-x="40" data-offset-y="280" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMargin secondRowSecondColumn" data-offset-x="140" data-offset-y="280" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<p>Direction: LTR | Self Alignment: center | auto size items | 1 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content itemsCenter">
+ <div class="autoMarginTop firstRowFirstColumn" data-offset-x="40" data-offset-y="160" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMarginRight firstRowSecondColumn" data-offset-x="100" data-offset-y="80" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMarginLeft secondRowFirstColumn" data-offset-x="80" data-offset-y="280" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMarginBottom secondRowSecondColumn" data-offset-x="140" data-offset-y="200" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ </div>
+</div>
+
+<p>Direction: LTR | Self Alignment: start | auto size items | 4 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content">
+ <div class="autoMargin firstRowFirstColumn" data-offset-x="40" data-offset-y="80" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMargin firstRowSecondColumn" data-offset-x="140" data-offset-y="80" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMargin secondRowFirstColumn" data-offset-x="40" data-offset-y="280" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMargin secondRowSecondColumn" data-offset-x="140" data-offset-y="280" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ </div>
+</div>
+
+<!-- direction RTL -->
+<p>Direction: RTL | Self Alignment: center | fixed size items | 1 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content itemsCenter directionRTL">
+ <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="140" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMarginRight firstRowSecondColumn" data-offset-x="0" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMarginLeft secondRowFirstColumn" data-offset-x="180" data-offset-y="280" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMarginBottom secondRowSecondColumn" data-offset-x="40" data-offset-y="200" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<p>Direction: RTL | Self Alignment: start | fixed size items | 4 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content directionRTL">
+ <div class="item autoMargin firstRowFirstColumn" data-offset-x="140" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMargin firstRowSecondColumn" data-offset-x="40" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMargin secondRowFirstColumn" data-offset-x="140" data-offset-y="280" data-expected-width="20" data-expected-height="40"></div>
+ <div class="item autoMargin secondRowSecondColumn" data-offset-x="40" data-offset-y="280" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<p>Direction: RTL | Self Alignment: center | auto size items | 1 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content itemsCenter directionRTL">
+ <div class="autoMarginTop firstRowFirstColumn" data-offset-x="140" data-offset-y="160" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMarginRight firstRowSecondColumn" data-offset-x="0" data-offset-y="80" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMarginLeft secondRowFirstColumn" data-offset-x="180" data-offset-y="280" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMarginBottom secondRowSecondColumn" data-offset-x="40" data-offset-y="200" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ </div>
+</div>
+
+<p>Direction: RTL | Self Alignment: start | auto size items | 4 auto-margin</p>
+<div style="position: relative">
+ <div class="grid fit-content directionRTL">
+ <div class="autoMargin firstRowFirstColumn" data-offset-x="140" data-offset-y="80" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMargin firstRowSecondColumn" data-offset-x="40" data-offset-y="80" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMargin secondRowFirstColumn" data-offset-x="140" data-offset-y="280" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ <div class="autoMargin secondRowSecondColumn" data-offset-x="40" data-offset-y="280" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
+ </div>
+</div>
+
+</body>
\ No newline at end of file
