Commit 4119fca8 authored by Rossana Monteriso's avatar Rossana Monteriso Committed by Commit Bot

Remove outdated css grid-align tests

This patch removes some outdated grid-align tests from:
third_party/blink/web_tests/fast/css-grid-layout/

The tests have been adapted and moved to WPT with the following PR:

* https://github.com/web-platform-tests/wpt/pull/19862/
* https://github.com/web-platform-tests/wpt/pull/19823/

and can now be found under:
third_party/blink/web_tests/external/wpt/css/css-grid/alignment/

This patch introduces also a minor correction to the description
inside the <p> divs of grid-align-stretching-replaced-items.html.

Change-Id: Ie8e3544e67e7238170d202394a43a6936a9ff07d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2010769
Commit-Queue: Manuel Rego <rego@igalia.com>
Reviewed-by: default avatarManuel Rego <rego@igalia.com>
Cr-Commit-Position: refs/heads/master@{#734861}
parent 7c1af0b1
...@@ -35,42 +35,42 @@ ...@@ -35,42 +35,42 @@
<p>This test checks that the alignment properties align-self and justify-self apply the 'stretch' value correctly on replaced elements.</p> <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"> <div style="position: relative">
<p>The green 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> <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"> <div class="grid">
<img src="/css/support/blue-100.png" data-expected-width="100" data-expected-height="100"/> <img src="/css/support/blue-100.png" data-expected-width="100" data-expected-height="100"/>
</div> </div>
</div> </div>
<div style="position: relative"> <div style="position: relative">
<p>The green image's original size is 100px x 100px, 'normal' is resolved as 'start' for replaced elements so it prevents stretching to be applied.</p> <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"> <div class="grid itemsNormal">
<img src="/css/support/blue-100.png" data-expected-width="100" data-expected-height="100"/> <img src="/css/support/blue-100.png" data-expected-width="100" data-expected-height="100"/>
</div> </div>
</div> </div>
<div style="position: relative"> <div style="position: relative">
<p>The green 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> <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"> <div class="grid alignItemsStretch justifyItemsStretch">
<img src="/css/support/blue-100.png" data-expected-width="500" data-expected-height="500"/> <img src="/css/support/blue-100.png" data-expected-width="500" data-expected-height="500"/>
</div> </div>
</div> </div>
<div style="position: relative"> <div style="position: relative">
<p>The green image's original size is 100px x 100px, non-stretch values prevent stretching to be applied.</p> <p>The blue image's original size is 100px x 100px, non-stretch values prevent stretching to be applied.</p>
<div class="grid itemsCenter"> <div class="grid itemsCenter">
<img src="/css/support/blue-100.png" data-expected-width="100" data-expected-height="100"/> <img src="/css/support/blue-100.png" data-expected-width="100" data-expected-height="100"/>
</div> </div>
</div> </div>
<div style="position: relative"> <div style="position: relative">
<p>The green image's original size is 100px x 100px, non-auto sizes prevent stretching to be applied.</p> <p>The blue image's original size is 100px x 100px, non-auto sizes prevent stretching to be applied.</p>
<div class="grid"> <div class="grid">
<img class="fixedSizes" src="/css/support/blue-100.png" data-expected-width="150" data-expected-height="150"/> <img class="fixedSizes" src="/css/support/blue-100.png" data-expected-width="150" data-expected-height="150"/>
</div> </div>
</div> </div>
<div style="position: relative"> <div style="position: relative">
<p>The green image's original size is 100px x 100px, auto-margins prevent stretching to be applied.</p> <p>The blue image's original size is 100px x 100px, auto-margins prevent stretching to be applied.</p>
<div class="grid"> <div class="grid">
<img class="autoMargins" src="/css/support/blue-100.png" data-expected-width="100" data-expected-height="100"/> <img class="autoMargins" src="/css/support/blue-100.png" data-expected-width="100" data-expected-height="100"/>
</div> </div>
......
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
<!DOCTYPE html>
<html>
<head>
<link href="resources/grid.css" rel="stylesheet">
<link href="resources/grid-alignment.css" rel="stylesheet">
<script src="../../resources/check-layout.js"></script>
<style>
body {
margin: 0;
}
.grid {
grid: 100px 100px / 50px 50px;
position: relative;
width: 300px;
height: 200px;
}
.cell {
width: 20px;
height: 40px;
}
</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>
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
<!DOCTYPE html>
<html>
<head>
<link href="resources/grid.css" rel="stylesheet">
<link href="resources/grid-alignment.css" rel="stylesheet">
<script src="../../resources/check-layout.js"></script>
<style>
body {
margin: 0;
}
.grid {
grid: 100px 100px / 50px 50px;
position: relative;
width: 300px;
height: 200px;
}
.cell {
width: 20px;
height: 40px;
}
</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>
<!DOCTYPE html>
<link href="resources/grid.css" rel="stylesheet">
<link href="resources/grid-alignment.css" rel="stylesheet">
<script src="../../resources/testharness.js"></script>
<script src="../../resources/testharnessreport.js"></script>
<script src="../../resources/check-layout-th.js"></script>
<style>
.grid {
grid-template-columns: 500px;
grid-template-rows: 500px;
}
.fixedSizes {
width: 150px;
height: 150px;
}
.autoMargins {
margin: auto;
}
</style>
<body onload="checkLayout('.grid')">
<div id="log"></div>
<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="../../images/resources/blue-100.png" 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="../../images/resources/blue-100.png" 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 itemsStretch">
<img src="../../images/resources/blue-100.png" 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="../../images/resources/blue-100.png" 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="../../images/resources/blue-100.png" 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="../../images/resources/blue-100.png" data-expected-width="100" data-expected-height="100"/>
</div>
</div>
</body>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment