Skip to content

Commit

Permalink
Import wpt@ea8f87db32e6ee3caa101b9cfb44e28d896388b1
Browse files Browse the repository at this point in the history
Using wpt-import in Chromium 222d1e6.
With Chromium commits locally applied on WPT:
1d5b803 "Add WebVTT support for inline styling - Web Platform Tests"
88d98fd "Add more scroll to text WPTs"


Note to sheriffs: This CL imports external tests and adds
expectations for those tests; if this CL is large and causes
a few new failures, please fix the failures by adding new
lines to TestExpectations rather than reverting. See:
https://chromium.googlesource.com/chromium/src/+/master/docs/testing/web_platform_tests.md

Directory owners for changes in this CL:
foolip@chromium.org, lpz@chromium.org, robertma@chromium.org:
  external/wpt/tools
rego@igalia.com:
  external/wpt/css/css-contain
  external/wpt/css/css-grid

NOAUTOREVERT=true
TBR=foolip

No-Export: true
Change-Id: Id5e8f88d03784476d8d6fb40b1ed8100c0b9ea7b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1914190
Reviewed-by: WPT Autoroller <wpt-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: WPT Autoroller <wpt-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#714966}
  • Loading branch information
Chromium WPT Sync authored and Commit Bot committed Nov 13, 2019
1 parent d346729 commit 1e0fe97
Show file tree
Hide file tree
Showing 12 changed files with 812 additions and 4 deletions.
103 changes: 101 additions & 2 deletions third_party/blink/web_tests/external/WPT_BASE_MANIFEST_6.json
Original file line number Diff line number Diff line change
Expand Up @@ -52163,6 +52163,18 @@
{}
]
],
"css/css-grid/implicit-grids/grid-support-grid-auto-columns-rows-003.html": [
[
"css/css-grid/implicit-grids/grid-support-grid-auto-columns-rows-003.html",
[
[
"/css/css-grid/reference/grid-support-grid-auto-columns-rows-003-ref.html",
"=="
]
],
{}
]
],
"css/css-grid/layout-algorithm/grid-layout-free-space-unit.html": [
[
"css/css-grid/layout-algorithm/grid-layout-free-space-unit.html",
Expand Down Expand Up @@ -56999,6 +57011,42 @@
{}
]
],
"css/css-masking/mask-image/mask-image-data-url-image.html": [
[
"css/css-masking/mask-image/mask-image-data-url-image.html",
[
[
"/css/css-masking/mask-image/reference/mask-image-data-url-image-ref.html",
"=="
]
],
{}
]
],
"css/css-masking/mask-image/mask-image-ib-split-2.html": [
[
"css/css-masking/mask-image/mask-image-ib-split-2.html",
[
[
"/css/css-masking/mask-image/reference/mask-image-ib-split-2-ref.html",
"=="
]
],
{}
]
],
"css/css-masking/mask-image/mask-image-ib-split.html": [
[
"css/css-masking/mask-image/mask-image-ib-split.html",
[
[
"/css/css-masking/mask-image/reference/mask-image-ib-split-ref.html",
"=="
]
],
{}
]
],
"css/css-masking/mask-image/mask-image-url-image-hash.html": [
[
"css/css-masking/mask-image/mask-image-url-image-hash.html",
Expand Down Expand Up @@ -140638,6 +140686,9 @@
"css/css-grid/reference/grid-support-grid-auto-columns-rows-002-ref.html": [
[]
],
"css/css-grid/reference/grid-support-grid-auto-columns-rows-003-ref.html": [
[]
],
"css/css-grid/reference/grid-text-green-margin-no-collapse-ref.html": [
[]
],
Expand Down Expand Up @@ -141463,6 +141514,18 @@
"css/css-masking/inheritance.sub-expected.txt": [
[]
],
"css/css-masking/mask-image/reference/1x1-black-30-alpha.png": [
[]
],
"css/css-masking/mask-image/reference/mask-image-data-url-image-ref.html": [
[]
],
"css/css-masking/mask-image/reference/mask-image-ib-split-2-ref.html": [
[]
],
"css/css-masking/mask-image/reference/mask-image-ib-split-ref.html": [
[]
],
"css/css-masking/mask-image/reference/mask-image-ref.html": [
[]
],
Expand Down Expand Up @@ -370901,7 +370964,7 @@
"reftest"
],
"css/css-contain/contain-size-select-002.html": [
"88d37323e1baffed92d431f9b951c4fef2b43e1c",
"1aa2d9f31d0cf4fe2b92f6d150e6c76596737115",
"reftest"
],
"css/css-contain/contain-strict-001.html": [
Expand Down Expand Up @@ -386560,6 +386623,10 @@
"2e90b460194568752c09ff94fd834deb08606fe4",
"reftest"
],
"css/css-grid/implicit-grids/grid-support-grid-auto-columns-rows-003.html": [
"452eb494b73e43a263f6f8b115338231bf5050a3",
"reftest"
],
"css/css-grid/inheritance.html": [
"eee86f70300d4280531235c813589dc3c399c58c",
"testharness"
Expand Down Expand Up @@ -386904,6 +386971,10 @@
"4a21823429eb25ecdc640ef7a80cd7f87bef0e6b",
"support"
],
"css/css-grid/reference/grid-support-grid-auto-columns-rows-003-ref.html": [
"5489a9bffe929345e4bda3a64040e565990f0b25",
"support"
],
"css/css-grid/reference/grid-text-green-margin-no-collapse-ref.html": [
"9dcba3f28fab37112a5bcb873228b66b1c7eb42b",
"support"
Expand Down Expand Up @@ -390228,6 +390299,18 @@
"95424204d5094bb1cbcd49e32f5e38c28d86d76f",
"testharness"
],
"css/css-masking/mask-image/mask-image-data-url-image.html": [
"aac59f3c4aabeb362aef0734ca9315d3a2331af4",
"reftest"
],
"css/css-masking/mask-image/mask-image-ib-split-2.html": [
"94c653a5c4714f8ee167fe35a76c53615fdfb5b5",
"reftest"
],
"css/css-masking/mask-image/mask-image-ib-split.html": [
"dab941b11183df95a16792c0c82923052ae501f0",
"reftest"
],
"css/css-masking/mask-image/mask-image-url-image-hash.html": [
"b1efc90818bec85d5022a9b908a14c2e0c35ff3b",
"reftest"
Expand All @@ -390244,6 +390327,22 @@
"f3f2eefaa92df83296379efd861b39e2ab65f78e",
"reftest"
],
"css/css-masking/mask-image/reference/1x1-black-30-alpha.png": [
"e334f44a038408f6b608f9aca4582a9b61e7beb4",
"support"
],
"css/css-masking/mask-image/reference/mask-image-data-url-image-ref.html": [
"c2e88b36571ecbeeb74cb9de3204ef5d7a261b2a",
"support"
],
"css/css-masking/mask-image/reference/mask-image-ib-split-2-ref.html": [
"ee28190878ab00f2d4e5625b8e19a9e5dfd98ba9",
"support"
],
"css/css-masking/mask-image/reference/mask-image-ib-split-ref.html": [
"e5c09f9449d59e3f8bca900db2705d5f4dfb8d78",
"support"
],
"css/css-masking/mask-image/reference/mask-image-ref.html": [
"4e121163f9d093b468e710882cb164bb965d9aa8",
"support"
Expand Down Expand Up @@ -511229,7 +511328,7 @@
"support"
],
"tools/wptrunner/wptrunner/wptrunner.py": [
"7dfd86e99c905ec4271707a953db90dedac850cf",
"cac172a5940ec696e3a3b279170f9712aaf4668d",
"support"
],
"tools/wptrunner/wptrunner/wpttest.py": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<!DOCTYPE html>
<html class="reftest-wait">
<meta charset="utf-8">
<title>CSS Containment Test: Size containment on select</title>
<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
Expand All @@ -19,5 +20,7 @@
<script>
window.requestAnimationFrame( () => {
target.style.contain = "size";
document.documentElement.removeAttribute("class");
});
</script>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
<!DOCTYPE html>
<html class="reftest-wait">
<head>
<meta charset="utf-8">
<title>CSS Grid Layout Test: Support for 'grid-auto-columns' and
'grid-auto-rows' properties with implicit tracks after and before the
explicit grid</title>
<link rel="help" href="https://drafts.csswg.org/css-grid/#auto-tracks">
<link rel="match" href="../reference/grid-support-grid-auto-columns-rows-003-ref.html">
<style>
#wrapper {
display: grid;
grid-template-columns: 50px 50px 50px 50px;
}

/* Implicit and explicit grid track sizes */
.grid {
display: grid;
grid-auto-rows: 2px 3px;
grid-auto-columns: 2px 3px;
}
#one .grid { grid-template: 5px / 5px; }
#two .grid { grid-template: 5px 5px / 5px 5px; }
#three .grid { grid-template: 5px 5px 5px / 5px 5px 5px; }

/* Grid item positions. */
.item-left1 { grid-area: auto / auto / 1 / 1; }
.item-explicit { grid-area: 1 / 1 / -1 / -1; }
.item-right1 { grid-area: -1 / -1; }

#zero .item-left3 { grid-area: auto / auto / -3 / -3; }
#zero .item-left2 { grid-area: auto / auto / -2 / -2; }
#zero .item-right2 { grid-area: 2 / 2; }
#zero .item-right3 { grid-area: 3 / 3; }
#one .item-left3 { grid-area: auto / auto / -4 / -4; }
#one .item-left2 { grid-area: auto / auto / -3 / -3; }
#one .item-right2 { grid-area: 3 / 3; }
#one .item-right3 { grid-area: 4 / 4; }
#two .item-left3 { grid-area: auto / auto / -5 / -5; }
#two .item-left2 { grid-area: auto / auto / -4 / -4; }
#two .item-right2 { grid-area: 4 / 4; }
#two .item-right3 { grid-area: 5 / 5; }
#three .item-left3 { grid-area: auto / auto / -6 / -6; }
#three .item-left2 { grid-area: auto / auto / -5 / -5; }
#three .item-right2 { grid-area: 5 / 5; }
#three .item-right3 { grid-area: 6 / 6; }

/* Colors */
.item-left3 { background: #ff0; }
.item-left2 { background: #ff0; }
.item-left1 { background: #ff0; }
.item-explicit { background: #f0f; }
.item-right1 { background: #0ff; }
.item-right2 { background: #0ff; }
.item-right3 { background: #0ff; }
</style>
<script>
function createDivWithClass(className, parent) {
let element = document.createElement('div');
element.className = className || '';
if (!parent) {
parent = document.body;
}
parent.appendChild(element);
return element;
}

function generate(parentId) {
let parent = document.getElementById(parentId);

for (let leftNum = 0; leftNum <= 3; ++leftNum) {
for (let rightNum = 0; rightNum <= 3; ++rightNum) {
let grid = leftNum + rightNum > 0
? createDivWithClass("grid", parent)
: null;

for (let i = 1; i <= leftNum; ++i) {
createDivWithClass("item-left" + i, grid);
}

if (leftNum + rightNum > 0) {
createDivWithClass("item-explicit", grid);
}

for (let i = 1; i <= rightNum; ++i) {
createDivWithClass("item-right" + i, grid);
}
}
}
}

function run() {
// This is equal to something like this:
// <div class="grid">
// <div class="item-left3"></div>
// <div class="item-left2"></div>
// <div class="item-left1"></div>
// <div class="item-explicit"></div>
// <div class="item-right1"></div>
// <div class="item-right2"></div>
// <div class="item-right3"></div>
// </div>
// Generate the grid examples with 0~3 left items and 0~3 right items.
// The item-explicit is placed inside the 0x0 ~ 3x3 explicit tracks.
generate("zero");
generate("one");
generate("two");
generate("three");

document.documentElement.offsetHeight;
document.documentElement.classList.remove('reftest-wait');
}
</script>
</head>
<body onload="run()">
<div id="wrapper">
<!-- Zero explicit track -->
<div id="zero"></div>

<!-- One explicit track -->
<div id="one"></div>

<!-- Two explicit tracks -->
<div id="two"></div>

<!-- Three explicit tracks -->
<div id="three"></div>
</div>
</body>
</html>
Loading

0 comments on commit 1e0fe97

Please sign in to comment.