aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-04-29 00:58:07 -0400
committerGitHub <noreply@github.com>2019-04-29 00:58:07 -0400
commitd58ea974baff1b51a43d2e2bf4b287ff11991a8d (patch)
tree77da4be3491080af45d794f28e94f818a6efaeca
parentc58f91ec1fd51ab7caff7d2e1453a15db6d8eb45 (diff)
parentc084436da7868db4ec43e8228f254abde16c5818 (diff)
downloadservo-d58ea974baff1b51a43d2e2bf4b287ff11991a8d.tar.gz
servo-d58ea974baff1b51a43d2e2bf4b287ff11991a8d.zip
Auto merge of #23285 - servo-wpt-sync:wpt_update_29-04-2019, r=servo-wpt-sync
Sync WPT with upstream (29-04-2019) Automated downstream sync of changes from upstream as of 29-04-2019. [no-wpt-sync]
-rw-r--r--tests/wpt/metadata/MANIFEST.json176
-rw-r--r--tests/wpt/metadata/css/CSS2/lists/counter-reset-increment-002.xht.ini2
-rw-r--r--tests/wpt/metadata/encoding/single-byte-decoder.html.ini1
-rw-r--r--tests/wpt/metadata/fetch/content-type/response.window.js.ini21
-rw-r--r--tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini (renamed from tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini)2
-rw-r--r--tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini4
-rw-r--r--tests/wpt/metadata/html/browsers/windows/nested-browsing-contexts/name-attribute.window.js.ini2
-rw-r--r--tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini7
-rw-r--r--tests/wpt/metadata/workers/WorkerGlobalScope-close.html.ini4
-rw-r--r--tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini2
-rw-r--r--tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini2
-rw-r--r--tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-increment-002.xht1
-rw-r--r--tests/wpt/web-platform-tests/css/css-lists/counter-reset-increment-set-display-contents.html (renamed from tests/wpt/web-platform-tests/css/css-lists/counter-reset-increment-display-contents.html)4
-rw-r--r--tests/wpt/web-platform-tests/css/css-lists/counter-reset-increment-set-display-none.html (renamed from tests/wpt/web-platform-tests/css/css-lists/counter-reset-increment-display-none.html)4
-rw-r--r--tests/wpt/web-platform-tests/css/css-lists/counter-set-001-ref.html37
-rw-r--r--tests/wpt/web-platform-tests/css/css-lists/counter-set-001.html40
-rw-r--r--tests/wpt/web-platform-tests/css/css-lists/li-list-item-counter-ref.html26
-rw-r--r--tests/wpt/web-platform-tests/css/css-lists/li-list-item-counter.html32
-rw-r--r--tests/wpt/web-platform-tests/css/css-lists/li-value-counter-reset-001-ref.html27
-rw-r--r--tests/wpt/web-platform-tests/css/css-lists/li-value-counter-reset-001.html30
-rw-r--r--tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-001-ref.html29
-rw-r--r--tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-001.html28
-rw-r--r--tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-002-ref.html38
-rw-r--r--tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-002.html37
-rw-r--r--tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-003-ref.html38
-rw-r--r--tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-003.html37
-rw-r--r--tests/wpt/web-platform-tests/css/css-scroll-snap/overflowing-snap-areas.html15
-rw-r--r--tests/wpt/web-platform-tests/fetch/api/request/request-keepalive.html2
-rw-r--r--tests/wpt/web-platform-tests/interfaces/mediacapture-streams.idl11
-rw-r--r--tests/wpt/web-platform-tests/interfaces/user-timing.idl6
-rw-r--r--tests/wpt/webgl/meta/conformance/textures/misc/texture-upload-size.html.ini3
31 files changed, 611 insertions, 57 deletions
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 2efe60b7fc6..4631dd191aa 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -127153,9 +127153,9 @@
{}
]
],
- "css/css-lists/counter-reset-increment-display-contents.html": [
+ "css/css-lists/counter-reset-increment-set-display-contents.html": [
[
- "css/css-lists/counter-reset-increment-display-contents.html",
+ "css/css-lists/counter-reset-increment-set-display-contents.html",
[
[
"/css/css-lists/counter-7-ref.html",
@@ -127165,9 +127165,9 @@
{}
]
],
- "css/css-lists/counter-reset-increment-display-none.html": [
+ "css/css-lists/counter-reset-increment-set-display-none.html": [
[
- "css/css-lists/counter-reset-increment-display-none.html",
+ "css/css-lists/counter-reset-increment-set-display-none.html",
[
[
"/css/css-lists/counter-7-ref.html",
@@ -127189,6 +127189,42 @@
{}
]
],
+ "css/css-lists/counter-set-001.html": [
+ [
+ "css/css-lists/counter-set-001.html",
+ [
+ [
+ "/css/css-lists/counter-set-001-ref.html",
+ "=="
+ ]
+ ],
+ {}
+ ]
+ ],
+ "css/css-lists/li-list-item-counter.html": [
+ [
+ "css/css-lists/li-list-item-counter.html",
+ [
+ [
+ "/css/css-lists/li-list-item-counter-ref.html",
+ "=="
+ ]
+ ],
+ {}
+ ]
+ ],
+ "css/css-lists/li-value-counter-reset-001.html": [
+ [
+ "css/css-lists/li-value-counter-reset-001.html",
+ [
+ [
+ "/css/css-lists/li-value-counter-reset-001-ref.html",
+ "=="
+ ]
+ ],
+ {}
+ ]
+ ],
"css/css-lists/li-with-height-001.html": [
[
"css/css-lists/li-with-height-001.html",
@@ -130969,6 +131005,42 @@
{}
]
],
+ "css/css-multicol/multicol-span-all-button-001.html": [
+ [
+ "css/css-multicol/multicol-span-all-button-001.html",
+ [
+ [
+ "/css/css-multicol/multicol-span-all-button-001-ref.html",
+ "=="
+ ]
+ ],
+ {}
+ ]
+ ],
+ "css/css-multicol/multicol-span-all-button-002.html": [
+ [
+ "css/css-multicol/multicol-span-all-button-002.html",
+ [
+ [
+ "/css/css-multicol/multicol-span-all-button-002-ref.html",
+ "=="
+ ]
+ ],
+ {}
+ ]
+ ],
+ "css/css-multicol/multicol-span-all-button-003.html": [
+ [
+ "css/css-multicol/multicol-span-all-button-003.html",
+ [
+ [
+ "/css/css-multicol/multicol-span-all-button-003-ref.html",
+ "=="
+ ]
+ ],
+ {}
+ ]
+ ],
"css/css-multicol/multicol-span-all-children-height-001.html": [
[
"css/css-multicol/multicol-span-all-children-height-001.html",
@@ -270609,6 +270681,21 @@
{}
]
],
+ "css/css-lists/counter-set-001-ref.html": [
+ [
+ {}
+ ]
+ ],
+ "css/css-lists/li-list-item-counter-ref.html": [
+ [
+ {}
+ ]
+ ],
+ "css/css-lists/li-value-counter-reset-001-ref.html": [
+ [
+ {}
+ ]
+ ],
"css/css-lists/li-with-height-001-ref.html": [
[
{}
@@ -271454,6 +271541,21 @@
{}
]
],
+ "css/css-multicol/multicol-span-all-button-001-ref.html": [
+ [
+ {}
+ ]
+ ],
+ "css/css-multicol/multicol-span-all-button-002-ref.html": [
+ [
+ {}
+ ]
+ ],
+ "css/css-multicol/multicol-span-all-button-003-ref.html": [
+ [
+ {}
+ ]
+ ],
"css/css-multicol/multicol-span-all-children-height-001-ref.html": [
[
{}
@@ -535945,7 +536047,7 @@
"support"
],
"css/CSS2/lists/counter-reset-increment-002.xht": [
- "bf422ba1eb890076652160080389d708360b5f0a",
+ "8dc50ca60b242153e74307021c9ab7435ab149a6",
"reftest"
],
"css/CSS2/lists/counter-reset-multiple-001.xht": [
@@ -593464,18 +593566,26 @@
"938015937025272c14a52b5839d65784ccb757bc",
"reftest"
],
- "css/css-lists/counter-reset-increment-display-contents.html": [
- "a59576b25345032b80580a64d4775969e824f999",
+ "css/css-lists/counter-reset-increment-set-display-contents.html": [
+ "6508df0da150a92e42032c546f2cf4ac6c171859",
"reftest"
],
- "css/css-lists/counter-reset-increment-display-none.html": [
- "3b344a751c1da2d3c15feab1cdba078cc3c4590a",
+ "css/css-lists/counter-reset-increment-set-display-none.html": [
+ "510fd8b6482be5a9007c111c6f8478bb659d72b0",
"reftest"
],
"css/css-lists/counter-reset-inside-display-contents.html": [
"85c137e675e55a54c4ab3834469ab3d13aa32725",
"reftest"
],
+ "css/css-lists/counter-set-001-ref.html": [
+ "be06ea1dc948b4f4cc9331f494dc90a5787170de",
+ "support"
+ ],
+ "css/css-lists/counter-set-001.html": [
+ "3be4c737c2ba0cc9af542413b7df7d682486efff",
+ "reftest"
+ ],
"css/css-lists/inheritance.html": [
"590319d63fd09466f4d5fffe6943b4ff0430fcee",
"testharness"
@@ -593484,6 +593594,22 @@
"0fae6e3f6036c46b8f658304787da5879913296f",
"testharness"
],
+ "css/css-lists/li-list-item-counter-ref.html": [
+ "8340d6d7f65aebaee0cebf0317092050bb33b4e2",
+ "support"
+ ],
+ "css/css-lists/li-list-item-counter.html": [
+ "b9a1196cabce1924b74bbd66d84917f02a4186a9",
+ "reftest"
+ ],
+ "css/css-lists/li-value-counter-reset-001-ref.html": [
+ "9afb1ecfa059dda219c63d6e4d6381ac5c251d4e",
+ "support"
+ ],
+ "css/css-lists/li-value-counter-reset-001.html": [
+ "0e91c3a03d618a9d17194c883f80fd90899d4459",
+ "reftest"
+ ],
"css/css-lists/li-with-height-001-ref.html": [
"486009d5604ab7a2cb66df735efff3c11c00b685",
"support"
@@ -595664,6 +595790,30 @@
"83debd12d20b9f78d5beaf338ae7f068ed6bf693",
"support"
],
+ "css/css-multicol/multicol-span-all-button-001-ref.html": [
+ "d25ecd08c85978ff34c964d2c95f339d7c69b6ae",
+ "support"
+ ],
+ "css/css-multicol/multicol-span-all-button-001.html": [
+ "14833091c8f1bd7804e4ad1a082d3cc0f039d0d9",
+ "reftest"
+ ],
+ "css/css-multicol/multicol-span-all-button-002-ref.html": [
+ "c9ec677335e4969ff10e10d98a43ce680dc5dbce",
+ "support"
+ ],
+ "css/css-multicol/multicol-span-all-button-002.html": [
+ "874cb130dee2ab8ba00e8beb29a4eae07138ddcf",
+ "reftest"
+ ],
+ "css/css-multicol/multicol-span-all-button-003-ref.html": [
+ "337f9c763aadb85c440f9811cab90ac8bccf8ffd",
+ "support"
+ ],
+ "css/css-multicol/multicol-span-all-button-003.html": [
+ "fc15c94a306f406bcf8e232a3021cf568a878a43",
+ "reftest"
+ ],
"css/css-multicol/multicol-span-all-children-height-001-ref.html": [
"e95210fed257c34d8c265259c7694497c1ff712d",
"support"
@@ -600861,7 +601011,7 @@
"testharness"
],
"css/css-scroll-snap/overflowing-snap-areas.html": [
- "8f6698d02064a05709c91b63a5905ca0f9dd992f",
+ "ee31847fddd16ec9d4a5b1e799c73461009f9e1a",
"testharness"
],
"css/css-scroll-snap/parsing/scroll-margin-block-invalid.html": [
@@ -648721,7 +648871,7 @@
"testharness"
],
"fetch/api/request/request-keepalive.html": [
- "c9e1a6acdd30ad85c8a60ae434b2a71f601e50a2",
+ "602fabc4db347139980d21f955cb20e59826739f",
"testharness"
],
"fetch/api/request/request-reset-attributes.https.html": [
@@ -671269,7 +671419,7 @@
"support"
],
"interfaces/mediacapture-streams.idl": [
- "0feea37802d9facb70978684b4faaf5780dbd0bb",
+ "427aa92dd1f750f305bccb0b9514820f5bc1d29b",
"support"
],
"interfaces/mediasession.idl": [
@@ -671441,7 +671591,7 @@
"support"
],
"interfaces/user-timing.idl": [
- "cd2e1446b89ef6bb2e03caadda707f141476c9b7",
+ "13ad7f8730d3cd269fa231a40ba490780bef476c",
"support"
],
"interfaces/vibration.idl": [
diff --git a/tests/wpt/metadata/css/CSS2/lists/counter-reset-increment-002.xht.ini b/tests/wpt/metadata/css/CSS2/lists/counter-reset-increment-002.xht.ini
new file mode 100644
index 00000000000..8bb5e32f71e
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/lists/counter-reset-increment-002.xht.ini
@@ -0,0 +1,2 @@
+[counter-reset-increment-002.xht]
+ expected: FAIL
diff --git a/tests/wpt/metadata/encoding/single-byte-decoder.html.ini b/tests/wpt/metadata/encoding/single-byte-decoder.html.ini
index 3d135f3bd66..939a36eb9d9 100644
--- a/tests/wpt/metadata/encoding/single-byte-decoder.html.ini
+++ b/tests/wpt/metadata/encoding/single-byte-decoder.html.ini
@@ -2,7 +2,6 @@
type: testharness
[single-byte-decoder.html?document]
- expected: TIMEOUT
[ISO-8859-4: iso_8859-4:1988 (document.characterSet and document.inputEncoding)]
expected: FAIL
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 0da9bf2e79e..18f786d4963 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,24 +312,3 @@
[<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
expected: FAIL
- [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
- expected: FAIL
-
- [<iframe>: separate response Content-Type: */* text/html]
- expected: FAIL
-
- [<iframe>: combined response Content-Type: */* text/html]
- expected: FAIL
-
- [<iframe>: separate response Content-Type: text/html */*]
- expected: FAIL
-
- [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
- expected: FAIL
-
- [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
- expected: FAIL
-
- [<iframe>: combined response Content-Type: text/html;x=" text/plain]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
index dc2e45516de..75d75b4cda2 100644
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_5.html]
+[traverse_the_history_2.html]
[Multiple history traversals, last would be aborted]
expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
new file mode 100644
index 00000000000..51f8272a6de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_3.html]
+ [Multiple history traversals, last would be aborted]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/windows/nested-browsing-contexts/name-attribute.window.js.ini b/tests/wpt/metadata/html/browsers/windows/nested-browsing-contexts/name-attribute.window.js.ini
index ef2deddc5dc..636c298b2a1 100644
--- a/tests/wpt/metadata/html/browsers/windows/nested-browsing-contexts/name-attribute.window.js.ini
+++ b/tests/wpt/metadata/html/browsers/windows/nested-browsing-contexts/name-attribute.window.js.ini
@@ -1,5 +1,5 @@
[name-attribute.window.html]
- expected: CRASH
+ expected: TIMEOUT
[cross-origin <frame name=>]
expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini b/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
new file mode 100644
index 00000000000..9e522297c94
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
@@ -0,0 +1,7 @@
+[toggleEvent.html]
+ [Calling open twice on 'details' fires only one toggle event]
+ expected: FAIL
+
+ [Setting open=true to opened 'details' element should not fire a toggle event at the 'details' element]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/workers/WorkerGlobalScope-close.html.ini b/tests/wpt/metadata/workers/WorkerGlobalScope-close.html.ini
new file mode 100644
index 00000000000..fe8654e447c
--- /dev/null
+++ b/tests/wpt/metadata/workers/WorkerGlobalScope-close.html.ini
@@ -0,0 +1,4 @@
+[WorkerGlobalScope-close.html]
+ [Test sending a message after closing.]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
new file mode 100644
index 00000000000..80f9a4f15b8
--- /dev/null
+++ b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
@@ -0,0 +1,2 @@
+[Worker-constructor.html]
+ expected: ERROR
diff --git a/tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini b/tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini
deleted file mode 100644
index dbea4f293ad..00000000000
--- a/tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[transition_calc_implicit.html]
- expected: TIMEOUT
diff --git a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-increment-002.xht b/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-increment-002.xht
index bf422ba1eb8..8dc50ca60b2 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-increment-002.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/lists/counter-reset-increment-002.xht
@@ -29,7 +29,6 @@
li:before
{
content: counter(list-item) ". ";
- counter-increment: list-item;
}
]]></style>
diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-reset-increment-display-contents.html b/tests/wpt/web-platform-tests/css/css-lists/counter-reset-increment-set-display-contents.html
index a59576b2534..6508df0da15 100644
--- a/tests/wpt/web-platform-tests/css/css-lists/counter-reset-increment-display-contents.html
+++ b/tests/wpt/web-platform-tests/css/css-lists/counter-reset-increment-set-display-contents.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<meta charset="utf-8">
-<title>CSS Lists: counter-reset and counter-increment on display:contents</title>
+<title>CSS Lists: counter-reset, counter-set and counter-increment on display:contents</title>
<link rel="author" title="Rune Lillesveen" href="mailto:futhark@chromium.org">
<link rel="help" href="https://drafts.csswg.org/css-lists/#counters-without-boxes">
<link rel="match" href="counter-7-ref.html">
@@ -8,6 +8,7 @@
.inc { counter-increment: x }
.reset-6 { counter-reset: x 6 }
.reset-666 { counter-reset: x 666 }
+ .set-666 { counter-set: x 666 }
.contents { display: contents }
.result::before { content: counter(x) }
</style>
@@ -15,5 +16,6 @@
<div>
<span class="reset-6"></span>
<span class="contents reset-666 inc"></span>
+ <span class="contents set-666"></span>
<span class="inc result"></span>
</div>
diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-reset-increment-display-none.html b/tests/wpt/web-platform-tests/css/css-lists/counter-reset-increment-set-display-none.html
index 3b344a751c1..510fd8b6482 100644
--- a/tests/wpt/web-platform-tests/css/css-lists/counter-reset-increment-display-none.html
+++ b/tests/wpt/web-platform-tests/css/css-lists/counter-reset-increment-set-display-none.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<meta charset="utf-8">
-<title>CSS Lists: counter-reset and counter-increment on display:none</title>
+<title>CSS Lists: counter-reset, counter-set and counter-increment on display:none</title>
<link rel="author" title="Rune Lillesveen" href="mailto:futhark@chromium.org">
<link rel="help" href="https://drafts.csswg.org/css-lists/#counters-without-boxes">
<link rel="match" href="counter-7-ref.html">
@@ -8,6 +8,7 @@
.inc { counter-increment: x }
.reset-6 { counter-reset: x 6 }
.reset-666 { counter-reset: x 666 }
+ .set-666 { counter-set: x 666 }
.none { display: none }
.result::before { content: counter(x) }
</style>
@@ -15,5 +16,6 @@
<div>
<span class="reset-6"></span>
<span class="none reset-666 inc"></span>
+ <span class="none set-666"></span>
<span class="inc result"></span>
</div>
diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-set-001-ref.html b/tests/wpt/web-platform-tests/css/css-lists/counter-set-001-ref.html
new file mode 100644
index 00000000000..be06ea1dc94
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-lists/counter-set-001-ref.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+ <meta charset="utf-8">
+ <title>CSS Lists: basic tests for 'counter-set'</title>
+ <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.org">
+ <style>
+html,body {
+ color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0;
+}
+ </style>
+</head>
+<body>
+
+<span>7</span><!-- "7" -->
+<span>0</span><!-- "0" -->
+<span>7</span><!-- "7" -->
+<span>8</span><!-- "8" -->
+<span>2</span><!-- "2" -->
+<x>
+ <span>2</span><!-- "2" -->
+</x>
+<span>3</span><!-- "3" -->
+<x>
+ <span>0</span><!-- "0" -->
+ <span>2</span><!-- "2" -->
+ <x>
+ <span>2.5</span><!-- "2.5" -->
+ </x>
+</x>
+<span>3</span><!-- "3" -->
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-set-001.html b/tests/wpt/web-platform-tests/css/css-lists/counter-set-001.html
new file mode 100644
index 00000000000..3be4c737c2b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-lists/counter-set-001.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+ <meta charset="utf-8">
+ <title>CSS Lists: basic tests for 'counter-set'</title>
+ <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.org">
+ <link rel="help" href="https://drafts.csswg.org/css-lists/#propdef-counter-set">
+ <link rel="match" href="counter-set-001-ref.html">
+ <style>
+html,body {
+ color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0;
+}
+span::before { content: counters(n, '.'); }
+ </style>
+</head>
+<body>
+
+<span style="counter-set: n 7"></span><!-- "7" -->
+<span style="counter-set: n"></span><!-- "0" -->
+<span style="counter-set: n 8 n 7"></span><!-- "7" -->
+<span style="counter-set: n 6; counter-increment: n 2"></span><!-- "8" -->
+<span style="counter-set: n; counter-increment: n 2"></span><!-- "2" -->
+<x style="counter-reset: n 9">
+ <span style="counter-set: n 2"></span><!-- "2" -->
+</x>
+<span style="counter-increment: n"></span><!-- "3" -->
+<x style="counter-reset: n 9">
+ <span style="counter-set: n"></span><!-- "0" -->
+ <span style="counter-set: n 2"></span><!-- "2" -->
+ <x style="counter-reset: n 1">
+ <span style="counter-set: n 5"></span><!-- "2.5" -->
+ </x>
+</x>
+<span style="counter-increment: n"></span><!-- "3" -->
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-list-item-counter-ref.html b/tests/wpt/web-platform-tests/css/css-lists/li-list-item-counter-ref.html
new file mode 100644
index 00000000000..8340d6d7f65
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-lists/li-list-item-counter-ref.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML>
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+ <meta charset="utf-8">
+ <title>Reference:_CSS Lists: 'counter-increment:list-item' on LI</title>
+ <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.org">
+ <style>
+html,body {
+ color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0;
+}
+body { margin-left: 10em; }
+ </style>
+</head>
+<body>
+
+<ol><li value=0>a<li value=4>b<li value=4>c</ol>
+<ol><li value=0>a<li value=9>b<li value=9>c</ol>
+<ol><li value=-1>a<li value=3>b<li value=2>c</ol>
+<ol><li value=0>a<li value=4>b<li value=4>c</ol>
+<ol><li value=2>a<li value=6>b<li value=8>c</ol>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-list-item-counter.html b/tests/wpt/web-platform-tests/css/css-lists/li-list-item-counter.html
new file mode 100644
index 00000000000..b9a1196cabc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-lists/li-list-item-counter.html
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML>
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+ <meta charset="utf-8">
+ <title>CSS Lists: 'counter-increment:list-item' on LI</title>
+ <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.org">
+ <link rel="help" href="https://drafts.csswg.org/css-lists/#propdef-counter-increment">
+ <link rel="match" href="li-list-item-counter-ref.html">
+ <style>
+html,body {
+ color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0;
+}
+body { margin-left: 10em; }
+li { counter-increment: list-item 0; }
+.dec { counter-increment:list-item -1; }
+.zero { counter-increment:list-item 1 list-item -1; }
+.two { counter-increment:list-item 3 list-item -1; }
+ </style>
+</head>
+<body>
+
+<ol><li>a<li value=4>b<li>c</ol>
+<ol><li>a<li value=4 style="counter-increment:list-item 5">b<li>c</ol>
+<ol><li class=dec>a<li value=4 class=dec>b<li class=dec>c</ol>
+<ol><li class=zero>a<li value=4 class=zero>b<li class=zero>c</ol>
+<ol><li class=two>a<li value=4 class=two>b<li class=two>c</ol>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-counter-reset-001-ref.html b/tests/wpt/web-platform-tests/css/css-lists/li-value-counter-reset-001-ref.html
new file mode 100644
index 00000000000..9afb1ecfa05
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-lists/li-value-counter-reset-001-ref.html
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML>
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+ <meta charset="utf-8">
+ <title>Reference:_CSS Lists: 'counter-set:list-item' trumps LI @value</title>
+ <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.org">
+ <style>
+html,body {
+ color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0;
+}
+body { margin-left: 10em; }
+ </style>
+</head>
+<body>
+
+<ol><li>a<li value=99>b</ol>
+<ol><li>a<li value=149>b</ol>
+<ol><li>a<li value=54>b</ol>
+<ol><li>a<li value=149>b</ol>
+<ol><li>a<li value=51>b</ol>
+<ol><li>a<li value=88>b</ol>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-lists/li-value-counter-reset-001.html b/tests/wpt/web-platform-tests/css/css-lists/li-value-counter-reset-001.html
new file mode 100644
index 00000000000..0e91c3a03d6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-lists/li-value-counter-reset-001.html
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML>
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+ <meta charset="utf-8">
+ <title>CSS Lists: 'counter-set:list-item' trumps LI @value</title>
+ <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.org">
+ <link rel="help" href="https://drafts.csswg.org/css-lists/#propdef-counter-set">
+ <link rel="match" href="li-value-counter-reset-001-ref.html">
+ <style>
+html,body {
+ color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0;
+}
+body { margin-left: 10em; }
+li.set { counter-set: list-item 99; }
+ </style>
+</head>
+<body>
+
+<ol><li>a<li value=4 class=set>b</ol>
+<ol><li>a<li value=4 class=set style="counter-increment:list-item 50">b</ol>
+<ol><li>a<li value=4 style="counter-increment:list-item 50">b</ol>
+<ol><li>a<li class=set style="counter-increment:list-item 50">b</ol>
+<ol><li>a<li style="counter-increment:list-item 50">b</ol>
+<ol><li>a<li value=4 class=set style="counter-set:list-item 88">b</ol>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-001-ref.html b/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-001-ref.html
new file mode 100644
index 00000000000..d25ecd08c85
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-001-ref.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+ <meta charset="utf-8">
+ <title>CSS Multi-column Layout Test: Test a multi-column container on button works with a column-span:all child</title>
+ <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+ <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+
+ <style>
+ button {
+ width: 400px;
+ }
+ .inner {
+ column-count: 3;
+ column-rule: 6px solid;
+ }
+ h3 {
+ column-span: all;
+ outline: 1px solid blue;
+ }
+ </style>
+
+ <button>
+ <div class="inner">
+ <div>block1</div><div>block2</div>
+ <h3>spanner</h3>
+ <div>block3</div><div>block4</div>
+ </div>
+ </button>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-001.html b/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-001.html
new file mode 100644
index 00000000000..14833091c8f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-001.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+ <meta charset="utf-8">
+ <title>CSS Multi-column Layout Test: Test a multi-column container on button works with a column-span:all child</title>
+ <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+ <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+ <link rel="help" href="https://drafts.csswg.org/css-multicol-1/#column-span">
+ <link rel="match" href="multicol-span-all-button-001-ref.html">
+ <meta name="assert" content="This test checks the page is rendered correctly for a multi-column container on button with a column-span:all child.">
+
+ <style>
+ button {
+ column-count: 3;
+ column-rule: 6px solid;
+ width: 400px;
+ }
+ h3 {
+ column-span: all;
+ outline: 1px solid blue;
+ }
+ </style>
+
+ <button>
+ <div>block1</div><div>block2</div>
+ <h3>spanner</h3>
+ <div>block3</div><div>block4</div>
+ </button>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-002-ref.html b/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-002-ref.html
new file mode 100644
index 00000000000..c9ec677335e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-002-ref.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+ <meta charset="utf-8">
+ <title>CSS Multi-column Layout Test: Test a overflow:hidden and position:absolute multi-column container on button works with a column-span:all child and position:absolute boxes</title>
+ <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+ <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+
+ <style>
+ button {
+ width: 400px;
+ padding: 1em;
+ overflow: hidden;
+ position: absolute;
+ }
+ .inner {
+ column-count: 3;
+ column-rule: 6px solid;
+ }
+ h3 {
+ column-span: all;
+ outline: 1px solid blue;
+ }
+ a {
+ position: absolute;
+ width: 1em;
+ height: 1em;
+ background-color: blue;
+ }
+ </style>
+
+ <button>
+ <div class="inner">
+ <div>block1</div><div>block2</div><a></a>
+ <h3>spanner<a></a></h3>
+ <div>block3</div><div>block4</div><a></a>
+ </div>
+ </button>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-002.html b/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-002.html
new file mode 100644
index 00000000000..874cb130dee
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-002.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+ <meta charset="utf-8">
+ <title>CSS Multi-column Layout Test: Test a overflow:hidden and position:absolute multi-column container on button works with a column-span:all child and position:absolute boxes</title>
+ <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+ <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+ <link rel="help" href="https://drafts.csswg.org/css-multicol-1/#column-span">
+ <link rel="match" href="multicol-span-all-button-002-ref.html">
+ <meta name="assert" content="This test checks the page is rendered correctly for a overflow:hidden and position:absolute button multi-column container with a column-span:all child and position:absolute boxes.">
+
+ <style>
+ button {
+ column-count: 3;
+ column-rule: 6px solid;
+ width: 400px;
+ padding: 1em;
+ overflow: hidden;
+ position: absolute;
+ }
+ h3 {
+ column-span: all;
+ outline: 1px solid blue;
+ }
+ a {
+ position: absolute;
+ width: 1em;
+ height: 1em;
+ background-color: blue;
+ }
+ </style>
+
+ <button>
+ <div>block1</div><div>block2</div><a></a>
+ <h3>spanner<a></a></h3>
+ <div>block3</div><div>block4</div><a></a>
+ </button>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-003-ref.html b/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-003-ref.html
new file mode 100644
index 00000000000..337f9c763aa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-003-ref.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+ <meta charset="utf-8">
+ <title>CSS Multi-column Layout Test: Test a overflow:hidden and position:absolute multi-column container on button works with a column-span:all child and position:fixed boxes</title>
+ <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+ <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+
+ <style>
+ button {
+ width: 400px;
+ padding: 1em;
+ overflow: hidden;
+ position: absolute;
+ }
+ .inner {
+ column-count: 3;
+ column-rule: 6px solid;
+ }
+ h3 {
+ column-span: all;
+ outline: 1px solid blue;
+ }
+ a {
+ position: fixed;
+ width: 1em;
+ height: 1em;
+ background-color: blue;
+ }
+ </style>
+
+ <button>
+ <div class="inner">
+ <div>block1</div><div>block2</div><a></a>
+ <h3>spanner<a></a></h3>
+ <div>block3</div><div>block4</div><a></a>
+ </div>
+ </button>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-003.html b/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-003.html
new file mode 100644
index 00000000000..fc15c94a306
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-button-003.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+ <meta charset="utf-8">
+ <title>CSS Multi-column Layout Test: Test a overflow:hidden and position:absolute multi-column container on button works with a column-span:all child and position:fixed boxes</title>
+ <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+ <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+ <link rel="help" href="https://drafts.csswg.org/css-multicol-1/#column-span">
+ <link rel="match" href="multicol-span-all-button-003-ref.html">
+ <meta name="assert" content="This test checks the page is rendered correctly for a overflow:hidden and position:absolute button multi-column container with a column-span:all child and position:absolute boxes.">
+
+ <style>
+ button {
+ column-count: 3;
+ column-rule: 6px solid;
+ width: 400px;
+ padding: 1em;
+ overflow: hidden;
+ position: absolute;
+ }
+ h3 {
+ column-span: all;
+ outline: 1px solid blue;
+ }
+ a {
+ position: fixed;
+ width: 1em;
+ height: 1em;
+ background-color: blue;
+ }
+ </style>
+
+ <button>
+ <div>block1</div><div>block2</div><a></a>
+ <h3>spanner<a></a></h3>
+ <div>block3</div><div>block4</div><a></a>
+ </button>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/overflowing-snap-areas.html b/tests/wpt/web-platform-tests/css/css-scroll-snap/overflowing-snap-areas.html
index 8f6698d0206..ee31847fddd 100644
--- a/tests/wpt/web-platform-tests/css/css-scroll-snap/overflowing-snap-areas.html
+++ b/tests/wpt/web-platform-tests/css/css-scroll-snap/overflowing-snap-areas.html
@@ -63,6 +63,7 @@ div {
<div class="target small" style="top: 200px"></div>
<div class="target small" style="top: 600px"></div>
<div class="target small" style="top: 1200px"></div>
+ <div class="target large-y" style="top: 2000px"></div>
</div>
</div>
@@ -144,6 +145,20 @@ test(() => {
"snap area covers snapport on y and there is no subsequent snap positions.");
test(() => {
+ const maxScrollTop = scroller_y.scrollHeight - scroller_y.clientHeight;
+
+ // Scroll to the bottom edge which is a valid snap position that a large
+ // target element covers the snapport.
+ scroller_y.scrollTo(0, maxScrollTop);
+ assert_equals(scroller_y.scrollTop, maxScrollTop);
+
+ // Scroll to `the bottom edge + 1`.
+ scroller_y.scrollTo(0, maxScrollTop + 1);
+ assert_equals(scroller_y.scrollTop, maxScrollTop);
+}, "Don't snap back even if scrollTo tries to scroll to positions which are " +
+ "outside of the scroll range and if a snap target element covers the snaport");
+
+test(() => {
two_axes_scroller.scrollTo(10, 100);
assert_equals(two_axes_scroller.scrollLeft, 10);
assert_equals(two_axes_scroller.scrollTop, 200);
diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-keepalive.html b/tests/wpt/web-platform-tests/fetch/api/request/request-keepalive.html
index c9e1a6acdd3..602fabc4db3 100644
--- a/tests/wpt/web-platform-tests/fetch/api/request/request-keepalive.html
+++ b/tests/wpt/web-platform-tests/fetch/api/request/request-keepalive.html
@@ -21,7 +21,7 @@ test(() => {
test(() => {
const init = {method: 'POST', keepalive: true, body: new ReadableStream()};
- assert_throws('TypeError', () => {new Request('/', init)});
+ assert_throws(new TypeError(), () => {new Request('/', init)});
}, 'keepalive flag with stream body');
</script>
</body>
diff --git a/tests/wpt/web-platform-tests/interfaces/mediacapture-streams.idl b/tests/wpt/web-platform-tests/interfaces/mediacapture-streams.idl
index 0feea37802d..427aa92dd1f 100644
--- a/tests/wpt/web-platform-tests/interfaces/mediacapture-streams.idl
+++ b/tests/wpt/web-platform-tests/interfaces/mediacapture-streams.idl
@@ -38,7 +38,6 @@ interface MediaStreamTrack : EventTarget {
MediaTrackConstraints getConstraints();
MediaTrackSettings getSettings();
Promise<void> applyConstraints(optional MediaTrackConstraints constraints);
- attribute EventHandler onoverconstrained;
};
enum MediaStreamTrackState {
@@ -149,16 +148,6 @@ dictionary MediaStreamTrackEventInit : EventInit {
required MediaStreamTrack track;
};
-[Exposed=Window,
- Constructor(DOMString type, OverconstrainedErrorEventInit eventInitDict)]
-interface OverconstrainedErrorEvent : Event {
- readonly attribute OverconstrainedError? error;
-};
-
-dictionary OverconstrainedErrorEventInit : EventInit {
- OverconstrainedError? error = null;
-};
-
partial interface Navigator {
[SameObject, SecureContext]
readonly attribute MediaDevices mediaDevices;
diff --git a/tests/wpt/web-platform-tests/interfaces/user-timing.idl b/tests/wpt/web-platform-tests/interfaces/user-timing.idl
index cd2e1446b89..13ad7f8730d 100644
--- a/tests/wpt/web-platform-tests/interfaces/user-timing.idl
+++ b/tests/wpt/web-platform-tests/interfaces/user-timing.idl
@@ -4,12 +4,12 @@
// Source: User Timing Level 3 (https://w3c.github.io/user-timing/)
dictionary PerformanceMarkOptions {
- any detail = null;
+ any detail;
DOMHighResTimeStamp startTime;
};
dictionary PerformanceMeasureOptions {
- any detail = null;
+ any detail;
(DOMString or DOMHighResTimeStamp) start;
DOMHighResTimeStamp duration;
(DOMString or DOMHighResTimeStamp) end;
@@ -18,7 +18,7 @@ dictionary PerformanceMeasureOptions {
partial interface Performance {
PerformanceMark mark(DOMString markName, optional PerformanceMarkOptions markOptions);
void clearMarks(optional DOMString markName);
- PerformanceMeasure measure(DOMString measureName, optional (DOMString or PerformanceMeasureOptions)? startOrMeasureOptions, optional DOMString endMark);
+ PerformanceMeasure measure(DOMString measureName, optional (DOMString or PerformanceMeasureOptions) startOrMeasureOptions, optional DOMString endMark);
void clearMeasures(optional DOMString measureName);
};
diff --git a/tests/wpt/webgl/meta/conformance/textures/misc/texture-upload-size.html.ini b/tests/wpt/webgl/meta/conformance/textures/misc/texture-upload-size.html.ini
index 18dc7710a29..2d2287c3de7 100644
--- a/tests/wpt/webgl/meta/conformance/textures/misc/texture-upload-size.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/misc/texture-upload-size.html.ini
@@ -41,3 +41,6 @@
[WebGL test #84: could not create image (SVG)]
expected: FAIL
+ [WebGL test #68: could not create image (SVG)]
+ expected: FAIL
+