Diff
Modified: trunk/LayoutTests/ChangeLog (255063 => 255064)
--- trunk/LayoutTests/ChangeLog 2020-01-24 11:17:17 UTC (rev 255063)
+++ trunk/LayoutTests/ChangeLog 2020-01-24 11:18:05 UTC (rev 255064)
@@ -1,3 +1,20 @@
+2020-01-24 Rossana Monteriso <[email protected]>
+
+ Import 2 sets of grid-align-tests from WPT
+ https://bugs.webkit.org/show_bug.cgi?id=206492
+
+ Reviewed by Manuel Rego Casasnovas.
+
+ Remove outdated grid-align tests, that are being replaced by newer tests, adapted to the WPT project and imported
+ to the corresponding css-grid folder inside WebKit.
+
+ * fast/css-grid-layout/grid-align-content-vertical-lr-expected.txt: Removed.
+ * fast/css-grid-layout/grid-align-content-vertical-rl-expected.txt: Removed.
+ * fast/css-grid-layout/grid-align-stretching-replaced-items-expected.txt: Removed.
+ * fast/css-grid-layout/grid-align-stretching-replaced-items.html: Removed.
+ * fast/css-grid-layout/grid-align-content-vertical-lr.html: Removed.
+ * fast/css-grid-layout/grid-align-content-vertical-rl.html: Removed.
+
2020-01-24 Antti Koivisto <[email protected]>
:matches() doesn't combine correctly with pseudo elements
Deleted: trunk/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-lr-expected.txt (255063 => 255064)
--- trunk/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-lr-expected.txt 2020-01-24 11:17:17 UTC (rev 255063)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-lr-expected.txt 2020-01-24 11:18:05 UTC (rev 255064)
@@ -1,32 +0,0 @@
-This test checks that the align-content property is applied correctly in vertical-lr grids.
-
-direction: LTR | align-content: 'center'
-
-PASS
-direction: LTR | align-content: 'left'
-
-PASS
-direction: LTR | align-content: 'right'
-
-PASS
-direction: LTR | align-content: 'start'
-
-PASS
-direction: LTR | align-content: 'end'
-
-PASS
-direction: RTL | align-content: 'center'
-
-PASS
-direction: RTL | align-content: 'left'
-
-PASS
-direction: RTL | align-content: 'right'
-
-PASS
-direction: RTL | align-content: 'start'
-
-PASS
-direction: RTL | align-content: 'end'
-
-PASS
Deleted: trunk/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-lr.html (255063 => 255064)
--- trunk/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-lr.html 2020-01-24 11:17:17 UTC (rev 255063)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-lr.html 2020-01-24 11:18:05 UTC (rev 255064)
@@ -1,158 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<link href="" rel="stylesheet">
-<script src=""
-<style>
-body {
- margin: 0;
-}
-
-.grid {
- grid: 100px 100px / 50px 50px;
- position: relative;
- width: 300px;
- height: 200px;
-}
-
-.cell {
- width: 20px;
- height: 40px;
-}
-
-.alignContentStart {
- align-content: start;
-}
-
-.alignContentEnd {
- align-content: end;
-}
-
-.alignContentCenter {
- align-content: center;
-}
-
-.alignContentLeft {
- align-content: left;
-}
-
-.alignContentRight {
- align-content: right;
-}
-
-.alignContentFlexStart {
- align-content: flex-start;
-}
-
-.alignContentFlexEnd {
- align-content: flex-end;
-}
-</style>
-</head>
-<body _onload_="checkLayout('.grid')">
-
-<p>This test checks that the align-content property is applied correctly in vertical-lr grids.</p>
-
-<div style="position: relative">
- <p>direction: LTR | align-content: 'center'</p>
- <div class="grid verticalLR alignContentCenter" data-expected-width="300" data-expected-height="200">
- <div class="cell firstRowFirstColumn" data-offset-x="50" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
- <div class="firstRowSecondColumn" data-offset-x="50" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
- <div class="secondRowFirstColumn" data-offset-x="150" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
- <div class="cell secondRowSecondColumn" data-offset-x="150" data-offset-y="50" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<div style="position: relative">
- <p>direction: LTR | align-content: 'left'</p>
- <div class="grid verticalLR alignContentLeft" data-expected-width="300" data-expected-height="200">
- <div class="cell firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
- <div class="firstRowSecondColumn" data-offset-x="0" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
- <div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
- <div class="cell secondRowSecondColumn" data-offset-x="100" data-offset-y="50" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<div style="position: relative">
- <p>direction: LTR | align-content: 'right'</p>
- <div class="grid verticalLR alignContentRight" data-expected-width="300" data-expected-height="200">
- <div class="cell firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
- <div class="firstRowSecondColumn" data-offset-x="0" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
- <div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
- <div class="cell secondRowSecondColumn" data-offset-x="100" data-offset-y="50" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<div style="position: relative">
- <p>direction: LTR | align-content: 'start'</p>
- <div class="grid verticalLR alignContentStart" data-expected-width="300" data-expected-height="200">
- <div class="cell firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
- <div class="firstRowSecondColumn" data-offset-x="0" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
- <div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
- <div class="cell secondRowSecondColumn" data-offset-x="100" data-offset-y="50" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<div style="position: relative">
- <p>direction: LTR | align-content: 'end'</p>
- <div class="grid verticalLR alignContentEnd" data-expected-width="300" data-expected-height="200">
- <div class="cell firstRowFirstColumn" data-offset-x="100" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
- <div class="firstRowSecondColumn" data-offset-x="100" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
- <div class="secondRowFirstColumn" data-offset-x="200" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
- <div class="cell secondRowSecondColumn" data-offset-x="200" data-offset-y="50" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<!-- RTL direction. -->
-<div style="position: relative">
- <p>direction: RTL | align-content: 'center'</p>
- <div class="grid directionRTL verticalLR alignContentCenter" data-expected-width="300" data-expected-height="200">
- <div class="cell firstRowFirstColumn" data-offset-x="50" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
- <div class="firstRowSecondColumn" data-offset-x="50" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
- <div class="secondRowFirstColumn" data-offset-x="150" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
- <div class="cell secondRowSecondColumn" data-offset-x="150" data-offset-y="110" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<div style="position: relative">
- <p>direction: RTL | align-content: 'left'</p>
- <div class="grid directionRTL verticalLR alignContentLeft" data-expected-width="300" data-expected-height="200">
- <div class="cell firstRowFirstColumn" data-offset-x="0" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
- <div class="firstRowSecondColumn" data-offset-x="0" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
- <div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
- <div class="cell secondRowSecondColumn" data-offset-x="100" data-offset-y="110" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<div style="position: relative">
- <p>direction: RTL | align-content: 'right'</p>
- <div class="grid directionRTL verticalLR alignContentRight" data-expected-width="300" data-expected-height="200">
- <div class="cell firstRowFirstColumn" data-offset-x="0" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
- <div class="firstRowSecondColumn" data-offset-x="0" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
- <div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
- <div class="cell secondRowSecondColumn" data-offset-x="100" data-offset-y="110" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<div style="position: relative">
- <p>direction: RTL | align-content: 'start'</p>
- <div class="grid directionRTL verticalLR alignContentStart" data-expected-width="300" data-expected-height="200">
- <div class="cell firstRowFirstColumn" data-offset-x="0" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
- <div class="firstRowSecondColumn" data-offset-x="0" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
- <div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
- <div class="cell secondRowSecondColumn" data-offset-x="100" data-offset-y="110" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<div style="position: relative">
- <p>direction: RTL | align-content: 'end'</p>
- <div class="grid directionRTL verticalLR alignContentEnd" data-expected-width="300" data-expected-height="200">
- <div class="cell firstRowFirstColumn" data-offset-x="100" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
- <div class="firstRowSecondColumn" data-offset-x="100" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
- <div class="secondRowFirstColumn" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
- <div class="cell secondRowSecondColumn" data-offset-x="200" data-offset-y="110" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-</body>
-</html>
Deleted: trunk/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-rl-expected.txt (255063 => 255064)
--- trunk/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-rl-expected.txt 2020-01-24 11:17:17 UTC (rev 255063)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-rl-expected.txt 2020-01-24 11:18:05 UTC (rev 255064)
@@ -1,32 +0,0 @@
-This test checks that the align-content property is applied correctly in vertical-rl grids.
-
-direction: LTR | align-content: 'center'
-
-PASS
-direction: LTR | align-content: 'left'
-
-PASS
-direction: LTR | align-content: 'right'
-
-PASS
-direction: LTR | align-content: 'start'
-
-PASS
-direction: LTR | align-content: 'end'
-
-PASS
-direction: RTL | align-content: 'center'
-
-PASS
-direction: RTL | align-content: 'left'
-
-PASS
-direction: RTL | align-content: 'right'
-
-PASS
-direction: RTL | align-content: 'start'
-
-PASS
-direction: RTL | align-content: 'end'
-
-PASS
Deleted: trunk/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-rl.html (255063 => 255064)
--- trunk/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-rl.html 2020-01-24 11:17:17 UTC (rev 255063)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-rl.html 2020-01-24 11:18:05 UTC (rev 255064)
@@ -1,159 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<link href="" rel="stylesheet">
-<script src=""
-<style>
-body {
- margin: 0;
-}
-
-.grid {
- grid: 100px 100px / 50px 50px;
- position: relative;
- width: 300px;
- height: 200px;
-}
-
-.cell {
- width: 20px;
- height: 40px;
-}
-
-.alignContentStart {
- align-content: start;
-}
-
-.alignContentEnd {
- align-content: end;
-}
-
-.alignContentCenter {
- align-content: center;
-}
-
-.alignContentLeft {
- align-content: left;
-}
-
-.alignContentRight {
- align-content: right;
-}
-
-.alignContentFlexStart {
- align-content: flex-start;
-}
-
-.alignContentFlexEnd {
- align-content: flex-end;
-}
-
-</style>
-</head>
-<body _onload_="checkLayout('.grid')">
-
-<p>This test checks that the align-content property is applied correctly in vertical-rl grids.</p>
-
-<div style="position: relative">
- <p>direction: LTR | align-content: 'center'</p>
- <div class="grid verticalRL alignContentCenter" data-expected-width="300" data-expected-height="200">
- <div class="cell firstRowFirstColumn" data-offset-x="230" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
- <div class="firstRowSecondColumn" data-offset-x="150" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
- <div class="secondRowFirstColumn" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
- <div class="cell secondRowSecondColumn" data-offset-x="130" data-offset-y="50" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<div style="position: relative">
- <p>direction: LTR | align-content: 'left'</p>
- <div class="grid verticalRL alignContentLeft" data-expected-width="300" data-expected-height="200">
- <div class="cell firstRowFirstColumn" data-offset-x="280" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
- <div class="firstRowSecondColumn" data-offset-x="200" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
- <div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
- <div class="cell secondRowSecondColumn" data-offset-x="180" data-offset-y="50" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<div style="position: relative">
- <p>direction: LTR | align-content: 'right'</p>
- <div class="grid verticalRL alignContentRight" data-expected-width="300" data-expected-height="200">
- <div class="cell firstRowFirstColumn" data-offset-x="280" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
- <div class="firstRowSecondColumn" data-offset-x="200" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
- <div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
- <div class="cell secondRowSecondColumn" data-offset-x="180" data-offset-y="50" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<div style="position: relative">
- <p>direction: LTR | align-content: 'start'</p>
- <div class="grid verticalRL alignContentStart" data-expected-width="300" data-expected-height="200">
- <div class="cell firstRowFirstColumn" data-offset-x="280" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
- <div class="firstRowSecondColumn" data-offset-x="200" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
- <div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
- <div class="cell secondRowSecondColumn" data-offset-x="180" data-offset-y="50" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<div style="position: relative">
- <p>direction: LTR | align-content: 'end'</p>
- <div class="grid verticalRL alignContentEnd" data-expected-width="300" data-expected-height="200">
- <div class="cell firstRowFirstColumn" data-offset-x="180" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
- <div class="firstRowSecondColumn" data-offset-x="100" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
- <div class="secondRowFirstColumn" data-offset-x="00" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
- <div class="cell secondRowSecondColumn" data-offset-x="80" data-offset-y="50" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<!-- RTL direction. -->
-<div style="position: relative">
- <p>direction: RTL | align-content: 'center'</p>
- <div class="grid directionRTL verticalRL alignContentCenter" data-expected-width="300" data-expected-height="200">
- <div class="cell firstRowFirstColumn" data-offset-x="230" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
- <div class="firstRowSecondColumn" data-offset-x="150" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
- <div class="secondRowFirstColumn" data-offset-x="50" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
- <div class="cell secondRowSecondColumn" data-offset-x="130" data-offset-y="110" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<div style="position: relative">
- <p>direction: RTL | align-content: 'left'</p>
- <div class="grid directionRTL verticalRL alignContentLeft" data-expected-width="300" data-expected-height="200">
- <div class="cell firstRowFirstColumn" data-offset-x="280" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
- <div class="firstRowSecondColumn" data-offset-x="200" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
- <div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
- <div class="cell secondRowSecondColumn" data-offset-x="180" data-offset-y="110" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<div style="position: relative">
- <p>direction: RTL | align-content: 'right'</p>
- <div class="grid directionRTL verticalRL alignContentRight" data-expected-width="300" data-expected-height="200">
- <div class="cell firstRowFirstColumn" data-offset-x="280" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
- <div class="firstRowSecondColumn" data-offset-x="200" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
- <div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
- <div class="cell secondRowSecondColumn" data-offset-x="180" data-offset-y="110" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<div style="position: relative">
- <p>direction: RTL | align-content: 'start'</p>
- <div class="grid directionRTL verticalRL alignContentStart" data-expected-width="300" data-expected-height="200">
- <div class="cell firstRowFirstColumn" data-offset-x="280" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
- <div class="firstRowSecondColumn" data-offset-x="200" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
- <div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
- <div class="cell secondRowSecondColumn" data-offset-x="180" data-offset-y="110" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-<div style="position: relative">
- <p>direction: RTL | align-content: 'end'</p>
- <div class="grid directionRTL verticalRL alignContentEnd" data-expected-width="300" data-expected-height="200">
- <div class="cell firstRowFirstColumn" data-offset-x="180" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
- <div class="firstRowSecondColumn" data-offset-x="100" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
- <div class="secondRowFirstColumn" data-offset-x="00" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
- <div class="cell secondRowSecondColumn" data-offset-x="80" data-offset-y="110" data-expected-width="20" data-expected-height="40"></div>
- </div>
-</div>
-
-</body>
-</html>
Deleted: trunk/LayoutTests/fast/css-grid-layout/grid-align-stretching-replaced-items-expected.txt (255063 => 255064)
--- trunk/LayoutTests/fast/css-grid-layout/grid-align-stretching-replaced-items-expected.txt 2020-01-24 11:17:17 UTC (rev 255063)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-align-stretching-replaced-items-expected.txt 2020-01-24 11:18:05 UTC (rev 255064)
@@ -1,26 +0,0 @@
-This test checks that the alignment properties align-self and justify-self apply the 'stretch' value correctly on replaced elements.
-
-The blue image's original size is 100px x 100px, default alignment is resolved as 'start' for replaced elements so it prevents stretching to be applied.
-
-
-PASS
-The blue image's original size is 100px x 100px, 'normal' is resolved as 'start' for replaced elements so it prevents stretching to be applied.
-
-
-PASS
-The blue image's original size is 100px x 100px, but it should be stretched to fill the 500px x 500px grid area it's placed into.
-
-
-PASS
-The blue image's original size is 100px x 100px, non-stretch values prevent stretching to be applied.
-
-
-PASS
-The blue image's original size is 100px x 100px, non-auto sizes prevent stretching to be applied.
-
-
-PASS
-The blue image's original size is 100px x 100px, auto-margins prevent stretching to be applied.
-
-
-PASS
Deleted: trunk/LayoutTests/fast/css-grid-layout/grid-align-stretching-replaced-items.html (255063 => 255064)
--- trunk/LayoutTests/fast/css-grid-layout/grid-align-stretching-replaced-items.html 2020-01-24 11:17:17 UTC (rev 255063)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-align-stretching-replaced-items.html 2020-01-24 11:18:05 UTC (rev 255064)
@@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<link href="" rel="stylesheet">
-<link href="" rel="stylesheet">
-<script src=""
-<style>
-.grid {
- grid-template-columns: 500px;
- grid-template-rows: 500px;
-}
-.fixedSizes {
- width: 150px;
- height: 150px;
-}
-.autoMargins {
- margin: auto;
-}
-</style>
-
-<body _onload_="checkLayout('.grid')">
-
- <p>This test checks that the alignment properties align-self and justify-self apply the 'stretch' value correctly on replaced elements.</p>
-
- <div style="position: relative">
- <p>The blue image's original size is 100px x 100px, default alignment is resolved as 'start' for replaced elements so it prevents stretching to be applied.</p>
- <div class="grid">
- <img src="" data-expected-width="100" data-expected-height="100"/>
- </div>
- </div>
-
- <div style="position: relative">
- <p>The blue image's original size is 100px x 100px, 'normal' is resolved as 'start' for replaced elements so it prevents stretching to be applied.</p>
- <div class="grid itemsNormal">
- <img src="" data-expected-width="100" data-expected-height="100"/>
- </div>
- </div>
-
- <div style="position: relative">
- <p>The blue image's original size is 100px x 100px, but it should be stretched to fill the 500px x 500px grid area it's placed into.</p>
- <div class="grid alignItemsStretch justifyItemsStretch">
- <img src="" data-expected-width="500" data-expected-height="500"/>
- </div>
- </div>
-
- <div style="position: relative">
- <p>The blue image's original size is 100px x 100px, non-stretch values prevent stretching to be applied.</p>
- <div class="grid itemsCenter">
- <img src="" data-expected-width="100" data-expected-height="100"/>
- </div>
- </div>
-
- <div style="position: relative">
- <p>The blue image's original size is 100px x 100px, non-auto sizes prevent stretching to be applied.</p>
- <div class="grid">
- <img class="fixedSizes" src="" data-expected-width="150" data-expected-height="150"/>
- </div>
- </div>
-
- <div style="position: relative">
- <p>The blue image's original size is 100px x 100px, auto-margins prevent stretching to be applied.</p>
- <div class="grid">
- <img class="autoMargins" src="" data-expected-width="100" data-expected-height="100"/>
- </div>
- </div>
-</body>
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (255063 => 255064)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2020-01-24 11:17:17 UTC (rev 255063)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2020-01-24 11:18:05 UTC (rev 255064)
@@ -1,3 +1,22 @@
+2020-01-24 Rossana Monteriso <[email protected]>
+
+ Import 2 sets of grid-align-tests from WPT
+ https://bugs.webkit.org/show_bug.cgi?id=206492
+
+ Reviewed by Manuel Rego Casasnovas.
+
+ Add outdated grid-align tests, checked and adapted to the WPT project, to the css-grid/alignment folder for imported tests.
+ Add also blue-100.png support file inside the css/support folder.
+ Correct the test description inside <p>, for grid-align-stretching-replaced-items.html.
+
+ * web-platform-tests/css/css-grid/alignment/grid-align-content-vertical-lr.html:
+ * web-platform-tests/css/css-grid/alignment/grid-align-content-vertical-rl.html:
+ * web-platform-tests/css/css-grid/alignment/grid-align-stretching-replaced-items.html:
+ * web-platform-tests/css/css-grid/alignment/grid-align-content-vertical-lr-expected.txt:
+ * web-platform-tests/css/css-grid/alignment/grid-align-content-vertical-rl-expected.txt:
+ * web-platform-tests/css/css-grid/alignment/grid-align-stretching-replaced-items-expected.txt:
+ * web-platform-tests/css/support/blue-100.png:
+
2020-01-22 Rob Buis <[email protected]>
Fix fetch/api/policies/referrer-origin-worker.html
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-align-content-vertical-lr-expected.txt (0 => 255064)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-align-content-vertical-lr-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-align-content-vertical-lr-expected.txt 2020-01-24 11:18:05 UTC (rev 255064)
@@ -0,0 +1,20 @@
+direction: LTR | align-content: 'center'
+
+direction: LTR | align-content: 'start'
+
+direction: LTR | align-content: 'end'
+
+direction: RTL | align-content: 'center'
+
+direction: RTL | align-content: 'start'
+
+direction: RTL | align-content: 'end'
+
+
+PASS .grid 1
+PASS .grid 2
+PASS .grid 3
+PASS .grid 4
+PASS .grid 5
+PASS .grid 6
+
Copied: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-align-content-vertical-lr.html (from rev 255063, trunk/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-lr.html) (0 => 255064)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-align-content-vertical-lr.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-align-content-vertical-lr.html 2020-01-24 11:18:05 UTC (rev 255064)
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout test: align-content in vertical-lr</title>
+<link rel="author" title="Rossana Monteriso" href=""
+<link rel="help" href=""
+<link rel="help" href=""
+<link rel="help" href=""
+<link rel="help" href=""
+<meta name="assert" content="This test checks that the align-content property is applied correctly in vertical-lr grids, for both LTR and RTL directions.">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="" />
+<link rel="stylesheet" href=""
+<link rel="stylesheet" href=""
+
+<style>
+
+.grid {
+ grid: 100px 100px / 50px 50px;
+ position: relative;
+ width: 300px;
+ height: 200px;
+}
+
+.cell {
+ width: 20px;
+ height: 40px;
+}
+
+</style>
+
+<script src=""
+<script src=""
+<script src=""
+
+<body _onload_="checkLayout('.grid')">
+
+<div style="position: relative">
+ <p>direction: LTR | align-content: 'center'</p>
+ <div class="grid verticalLR alignContentCenter" data-expected-width="300" data-expected-height="200">
+ <div class="cell firstRowFirstColumn" data-offset-x="50" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
+ <div class="firstRowSecondColumn" data-offset-x="50" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
+ <div class="secondRowFirstColumn" data-offset-x="150" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
+ <div class="cell secondRowSecondColumn" data-offset-x="150" data-offset-y="50" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<div style="position: relative">
+ <p>direction: LTR | align-content: 'start'</p>
+ <div class="grid verticalLR alignContentStart" data-expected-width="300" data-expected-height="200">
+ <div class="cell firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
+ <div class="firstRowSecondColumn" data-offset-x="0" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
+ <div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
+ <div class="cell secondRowSecondColumn" data-offset-x="100" data-offset-y="50" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<div style="position: relative">
+ <p>direction: LTR | align-content: 'end'</p>
+ <div class="grid verticalLR alignContentEnd" data-expected-width="300" data-expected-height="200">
+ <div class="cell firstRowFirstColumn" data-offset-x="100" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
+ <div class="firstRowSecondColumn" data-offset-x="100" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
+ <div class="secondRowFirstColumn" data-offset-x="200" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
+ <div class="cell secondRowSecondColumn" data-offset-x="200" data-offset-y="50" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<!-- RTL direction. -->
+<div style="position: relative">
+ <p>direction: RTL | align-content: 'center'</p>
+ <div class="grid directionRTL verticalLR alignContentCenter" data-expected-width="300" data-expected-height="200">
+ <div class="cell firstRowFirstColumn" data-offset-x="50" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+ <div class="firstRowSecondColumn" data-offset-x="50" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
+ <div class="secondRowFirstColumn" data-offset-x="150" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
+ <div class="cell secondRowSecondColumn" data-offset-x="150" data-offset-y="110" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<div style="position: relative">
+ <p>direction: RTL | align-content: 'start'</p>
+ <div class="grid directionRTL verticalLR alignContentStart" data-expected-width="300" data-expected-height="200">
+ <div class="cell firstRowFirstColumn" data-offset-x="0" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+ <div class="firstRowSecondColumn" data-offset-x="0" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
+ <div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
+ <div class="cell secondRowSecondColumn" data-offset-x="100" data-offset-y="110" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<div style="position: relative">
+ <p>direction: RTL | align-content: 'end'</p>
+ <div class="grid directionRTL verticalLR alignContentEnd" data-expected-width="300" data-expected-height="200">
+ <div class="cell firstRowFirstColumn" data-offset-x="100" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+ <div class="firstRowSecondColumn" data-offset-x="100" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
+ <div class="secondRowFirstColumn" data-offset-x="200" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
+ <div class="cell secondRowSecondColumn" data-offset-x="200" data-offset-y="110" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+</body>
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-align-content-vertical-rl-expected.txt (0 => 255064)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-align-content-vertical-rl-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-align-content-vertical-rl-expected.txt 2020-01-24 11:18:05 UTC (rev 255064)
@@ -0,0 +1,20 @@
+direction: LTR | align-content: 'center'
+
+direction: LTR | align-content: 'start'
+
+direction: LTR | align-content: 'end'
+
+direction: RTL | align-content: 'center'
+
+direction: RTL | align-content: 'start'
+
+direction: RTL | align-content: 'end'
+
+
+PASS .grid 1
+PASS .grid 2
+PASS .grid 3
+PASS .grid 4
+PASS .grid 5
+PASS .grid 6
+
Copied: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-align-content-vertical-rl.html (from rev 255063, trunk/LayoutTests/fast/css-grid-layout/grid-align-content-vertical-rl.html) (0 => 255064)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-align-content-vertical-rl.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-align-content-vertical-rl.html 2020-01-24 11:18:05 UTC (rev 255064)
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout test: align-content in vertical-rl</title>
+<link rel="author" title="Rossana Monteriso" href=""
+<link rel="help" href=""
+<link rel="help" href=""
+<link rel="help" href=""
+<link rel="help" href=""
+<meta name="assert" content="This test checks that the align-content property is applied correctly in vertical-rl grids, for both LTR and RTL directions.">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="" />
+<link rel="stylesheet" href=""
+<link rel="stylesheet" href=""
+
+<style>
+
+.grid {
+ grid: 100px 100px / 50px 50px;
+ position: relative;
+ width: 300px;
+ height: 200px;
+}
+
+.cell {
+ width: 20px;
+ height: 40px;
+}
+
+</style>
+
+<script src=""
+<script src=""
+<script src=""
+
+<body _onload_="checkLayout('.grid')">
+
+<div style="position: relative">
+ <p>direction: LTR | align-content: 'center'</p>
+ <div class="grid verticalRL alignContentCenter" data-expected-width="300" data-expected-height="200">
+ <div class="cell firstRowFirstColumn" data-offset-x="230" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
+ <div class="firstRowSecondColumn" data-offset-x="150" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
+ <div class="secondRowFirstColumn" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
+ <div class="cell secondRowSecondColumn" data-offset-x="130" data-offset-y="50" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<div style="position: relative">
+ <p>direction: LTR | align-content: 'start'</p>
+ <div class="grid verticalRL alignContentStart" data-expected-width="300" data-expected-height="200">
+ <div class="cell firstRowFirstColumn" data-offset-x="280" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
+ <div class="firstRowSecondColumn" data-offset-x="200" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
+ <div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
+ <div class="cell secondRowSecondColumn" data-offset-x="180" data-offset-y="50" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<div style="position: relative">
+ <p>direction: LTR | align-content: 'end'</p>
+ <div class="grid verticalRL alignContentEnd" data-expected-width="300" data-expected-height="200">
+ <div class="cell firstRowFirstColumn" data-offset-x="180" data-offset-y="0" data-expected-width="20" data-expected-height="40"></div>
+ <div class="firstRowSecondColumn" data-offset-x="100" data-offset-y="50" data-expected-width="100" data-expected-height="50"></div>
+ <div class="secondRowFirstColumn" data-offset-x="00" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
+ <div class="cell secondRowSecondColumn" data-offset-x="80" data-offset-y="50" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<!-- RTL direction. -->
+<div style="position: relative">
+ <p>direction: RTL | align-content: 'center'</p>
+ <div class="grid directionRTL verticalRL alignContentCenter" data-expected-width="300" data-expected-height="200">
+ <div class="cell firstRowFirstColumn" data-offset-x="230" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+ <div class="firstRowSecondColumn" data-offset-x="150" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
+ <div class="secondRowFirstColumn" data-offset-x="50" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
+ <div class="cell secondRowSecondColumn" data-offset-x="130" data-offset-y="110" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<div style="position: relative">
+ <p>direction: RTL | align-content: 'start'</p>
+ <div class="grid directionRTL verticalRL alignContentStart" data-expected-width="300" data-expected-height="200">
+ <div class="cell firstRowFirstColumn" data-offset-x="280" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+ <div class="firstRowSecondColumn" data-offset-x="200" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
+ <div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
+ <div class="cell secondRowSecondColumn" data-offset-x="180" data-offset-y="110" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+<div style="position: relative">
+ <p>direction: RTL | align-content: 'end'</p>
+ <div class="grid directionRTL verticalRL alignContentEnd" data-expected-width="300" data-expected-height="200">
+ <div class="cell firstRowFirstColumn" data-offset-x="180" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
+ <div class="firstRowSecondColumn" data-offset-x="100" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
+ <div class="secondRowFirstColumn" data-offset-x="00" data-offset-y="150" data-expected-width="100" data-expected-height="50"></div>
+ <div class="cell secondRowSecondColumn" data-offset-x="80" data-offset-y="110" data-expected-width="20" data-expected-height="40"></div>
+ </div>
+</div>
+
+</body>
Copied: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-align-stretching-replaced-items-expected.txt (from rev 255063, trunk/LayoutTests/fast/css-grid-layout/grid-align-stretching-replaced-items-expected.txt) (0 => 255064)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-align-stretching-replaced-items-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-align-stretching-replaced-items-expected.txt 2020-01-24 11:18:05 UTC (rev 255064)
@@ -0,0 +1,28 @@
+This test checks that the alignment properties align-self and justify-self apply the 'stretch' value correctly on replaced elements.
+
+The blue image's original size is 100px x 100px, default alignment is resolved as 'start' for replaced elements so it prevents stretching to be applied.
+
+
+The blue image's original size is 100px x 100px, 'normal' is resolved as 'start' for replaced elements so it prevents stretching to be applied.
+
+
+The blue image's original size is 100px x 100px, but it should be stretched to fill the 500px x 500px grid area it's placed into.
+
+
+The blue image's original size is 100px x 100px, non-stretch values prevent stretching to be applied.
+
+
+The blue image's original size is 100px x 100px, non-auto sizes prevent stretching to be applied.
+
+
+The blue image's original size is 100px x 100px, auto-margins prevent stretching to be applied.
+
+
+
+PASS .grid 1
+PASS .grid 2
+PASS .grid 3
+PASS .grid 4
+PASS .grid 5
+PASS .grid 6
+
Copied: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-align-stretching-replaced-items.html (from rev 255063, trunk/LayoutTests/fast/css-grid-layout/grid-align-stretching-replaced-items.html) (0 => 255064)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-align-stretching-replaced-items.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-align-stretching-replaced-items.html 2020-01-24 11:18:05 UTC (rev 255064)
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: alignment for replaced element</title>
+<link rel="author" title="Rossana Monteriso" href=""
+<link rel="help" href=""
+<link rel="help" href=""
+<link rel="help" href=""
+<link rel="help" href=""
+<link rel="help" href=""
+<meta name="assert" content="This test checks that the alignment properties apply the 'stretch' value correctly on replaced elements, such as images.">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="" />
+<link rel="stylesheet" href=""
+<link rel="stylesheet" href=""
+
+<style>
+.grid {
+ grid-template-columns: 500px;
+ grid-template-rows: 500px;
+}
+.fixedSizes {
+ width: 150px;
+ height: 150px;
+}
+.autoMargins {
+ margin: auto;
+}
+</style>
+<script src=""
+<script src=""
+<script src=""
+
+<body _onload_="checkLayout('.grid')">
+
+ <p>This test checks that the alignment properties align-self and justify-self apply the 'stretch' value correctly on replaced elements.</p>
+
+ <div style="position: relative">
+ <p>The blue image's original size is 100px x 100px, default alignment is resolved as 'start' for replaced elements so it prevents stretching to be applied.</p>
+ <div class="grid">
+ <img src="" data-expected-width="100" data-expected-height="100"/>
+ </div>
+ </div>
+
+ <div style="position: relative">
+ <p>The blue image's original size is 100px x 100px, 'normal' is resolved as 'start' for replaced elements so it prevents stretching to be applied.</p>
+ <div class="grid itemsNormal">
+ <img src="" data-expected-width="100" data-expected-height="100"/>
+ </div>
+ </div>
+
+ <div style="position: relative">
+ <p>The blue image's original size is 100px x 100px, but it should be stretched to fill the 500px x 500px grid area it's placed into.</p>
+ <div class="grid alignItemsStretch justifyItemsStretch">
+ <img src="" data-expected-width="500" data-expected-height="500"/>
+ </div>
+ </div>
+
+ <div style="position: relative">
+ <p>The blue image's original size is 100px x 100px, non-stretch values prevent stretching to be applied.</p>
+ <div class="grid itemsCenter">
+ <img src="" data-expected-width="100" data-expected-height="100"/>
+ </div>
+ </div>
+
+ <div style="position: relative">
+ <p>The blue image's original size is 100px x 100px, non-auto sizes prevent stretching to be applied.</p>
+ <div class="grid">
+ <img class="fixedSizes" src="" data-expected-width="150" data-expected-height="150"/>
+ </div>
+ </div>
+
+ <div style="position: relative">
+ <p>The blue image's original size is 100px x 100px, auto-margins prevent stretching to be applied.</p>
+ <div class="grid">
+ <img class="autoMargins" src="" data-expected-width="100" data-expected-height="100"/>
+ </div>
+ </div>
+</body>
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/support/blue-100.png
(Binary files differ)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/support/blue-100.png 2020-01-24 11:17:17 UTC (rev 255063)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/support/blue-100.png 2020-01-24 11:18:05 UTC (rev 255064)
Property changes on: trunk/LayoutTests/imported/w3c/web-platform-tests/css/support/blue-100.png
___________________________________________________________________
Added: svn:mime-type
+image/png
\ No newline at end of property
