Skip to content

Commit 285c9f1

Browse files
committed
Merge branch 'master' into check-layout-delay
* master: (29 commits) WebCryptoAPI: check that CryptoKey instances have the expected Symbol.toStringTag (web-platform-tests#37716) ResizeObserver: Element with size 0x0 should be notified (web-platform-tests#38041) WebCryptoAPI: remove test for OperationError for tagLength 256 (web-platform-tests#37734) [scroll-timeline] Implement animation-range [Web Platform Test] Remove extra indent from shipping-option test [scroll-timeline] Reverse scroll-timeline-axis/name [Web Platform Test] Remove extra indents from delegations tests [Web Platform Test] Just-in-time install for shipping-option test [Web Platform Test] Just-in-time install for delegations test remove auth header from redirected cross-origin requests. Add tests for [Transferable] VideoFrame Make the style editor handle `<font>` at last when there are multiple preserved styles Make css-fonts/animations/font-variation-settings-composition.html less finicky about serialization order for font-variation-settings. [scroll-timeline] Hide support for tree-scoped timeline behind a flag Use script instead of fetch to de-flake firefox Retries in cache test Clean up doc test Fix CR comments Update preload/prefetch-cache.html Add test cases for cross-origin error events ...
2 parents d907632 + 450f829 commit 285c9f1

File tree

51 files changed

+1612
-455
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1612
-455
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// META: title=BFCache support test for page with open IndexedDB transaction
2+
// META: script=/common/dispatcher/dispatcher.js
3+
// META: script=/common/utils.js
4+
// META: script=/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js
5+
// META: script=/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js
6+
7+
'use strict';
8+
9+
promise_test(async t => {
10+
const rcHelper = new RemoteContextHelper();
11+
12+
// Open a window with noopener so that BFCache will work.
13+
const rc1 = await rcHelper.addWindow(
14+
/*config=*/ null, /*options=*/ {features: 'noopener'});
15+
16+
await rc1.executeScript(() => {
17+
// Create an IndexedDB database and the object store named `store` as the
18+
// test scope for the transaction later on.
19+
const db = indexedDB.open(/*name=*/ 'test_idb', /*version=*/ 1);
20+
db.onupgradeneeded = () => {
21+
db.result.createObjectStore('store');
22+
};
23+
addEventListener('pagehide', () => {
24+
let transaction = db.result.transaction(['store'], 'readwrite');
25+
let store = transaction.objectStore('store');
26+
store.put("key", "value");
27+
28+
// Queue a request to close the connection, while keeping the transaction
29+
// open, so that the BFCache eligibility will be determined solely by the
30+
// pending transaction.
31+
db.result.close();
32+
});
33+
});
34+
35+
await assertBFCache(rc1, /*shouldRestoreFromBFCache=*/ true);
36+
});

WebCryptoAPI/encrypt_decrypt/aes_gcm_vectors.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ function getTestVectors() {
246246
var failing = [];
247247
keyLengths.forEach(function(keyLength) {
248248
// First, make some tests for bad tag lengths
249-
[24, 48, 72, 95, 129, 256].forEach(function(badTagLength) {
249+
[24, 48, 72, 95, 129].forEach(function(badTagLength) {
250250
failing.push({
251251
name: "AES-GCM " + keyLength.toString() + "-bit key, illegal tag length " + badTagLength.toString() + "-bits",
252252
keyBuffer: keyBytes[keyLength],

WebCryptoAPI/util/helpers.js

+1
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ function assert_goodCryptoKey(key, algorithm, extractable, usages, kind) {
160160
assert_in_array(usage, correctUsages, "Has " + usage + " usage");
161161
});
162162
assert_equals(key.usages.length, usageCount, "usages property is correct");
163+
assert_equals(key[Symbol.toStringTag], 'CryptoKey', "has the expected Symbol.toStringTag");
163164
}
164165

165166

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<!DOCTYPE html>
2-
<link rel="help" href="https://drafts.csswg.org/scroll-animations-1/#propdef-animation-delay-start">
2+
<link rel="help" href="https://drafts.csswg.org/scroll-animations-1/#propdef-animation-delay-end">
33
<script src="/resources/testharness.js"></script>
44
<script src="/resources/testharnessreport.js"></script>
55
<script src="/css/support/computed-testcommon.js"></script>
66
<div id="target"></div>
77
<script>
8-
test_computed_value("animation-delay-start", "initial", "0s");
9-
test_computed_value("animation-delay-start", "-500ms", "-0.5s");
10-
test_computed_value("animation-delay-start", "calc(2 * 3s)", "6s");
11-
test_computed_value("animation-delay-start", "20s, 10s");
8+
test_computed_value("animation-delay-end", "initial", "0s");
9+
test_computed_value("animation-delay-end", "-500ms", "-0.5s");
10+
test_computed_value("animation-delay-end", "calc(2 * 3s)", "6s");
11+
test_computed_value("animation-delay-end", "20s, 10s");
1212
</script>
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<!DOCTYPE html>
2-
<link rel="help" href="https://drafts.csswg.org/scroll-animations-1/#propdef-animation-delay-start">
2+
<link rel="help" href="https://drafts.csswg.org/scroll-animations-1/#propdef-animation-delay-end">
33
<script src="/resources/testharness.js"></script>
44
<script src="/resources/testharnessreport.js"></script>
55
<script src="/css/support/parsing-testcommon.js"></script>
66
<script>
7-
test_invalid_value("animation-delay-start", "infinite");
8-
test_invalid_value("animation-delay-start", "0");
9-
test_invalid_value("animation-delay-start", "1s 2s");
10-
test_invalid_value("animation-delay-start", "1s / 2s");
11-
test_invalid_value("animation-delay-start", "100px");
12-
test_invalid_value("animation-delay-start", "100%");
7+
test_invalid_value("animation-delay-end", "infinite");
8+
test_invalid_value("animation-delay-end", "0");
9+
test_invalid_value("animation-delay-end", "1s 2s");
10+
test_invalid_value("animation-delay-end", "1s / 2s");
11+
test_invalid_value("animation-delay-end", "100px");
12+
test_invalid_value("animation-delay-end", "100%");
1313

14-
test_invalid_value("animation-delay-start", "peek 50%");
15-
test_invalid_value("animation-delay-start", "50% contain");
16-
test_invalid_value("animation-delay-start", "50% cover");
17-
test_invalid_value("animation-delay-start", "50% entry");
18-
test_invalid_value("animation-delay-start", "50% enter");
19-
test_invalid_value("animation-delay-start", "50% exit");
20-
test_invalid_value("animation-delay-start", "contain contain");
21-
test_invalid_value("animation-delay-start", "auto");
22-
test_invalid_value("animation-delay-start", "none");
23-
test_invalid_value("animation-delay-start", "cover 50% enter 50%");
24-
test_invalid_value("animation-delay-start", "cover 100px");
25-
test_invalid_value("animation-delay-start", "cover");
26-
test_invalid_value("animation-delay-start", "contain");
27-
test_invalid_value("animation-delay-start", "enter");
28-
test_invalid_value("animation-delay-start", "exit");
14+
test_invalid_value("animation-delay-end", "peek 50%");
15+
test_invalid_value("animation-delay-end", "50% contain");
16+
test_invalid_value("animation-delay-end", "50% cover");
17+
test_invalid_value("animation-delay-end", "50% entry");
18+
test_invalid_value("animation-delay-end", "50% enter");
19+
test_invalid_value("animation-delay-end", "50% exit");
20+
test_invalid_value("animation-delay-end", "contain contain");
21+
test_invalid_value("animation-delay-end", "auto");
22+
test_invalid_value("animation-delay-end", "none");
23+
test_invalid_value("animation-delay-end", "cover 50% enter 50%");
24+
test_invalid_value("animation-delay-end", "cover 100px");
25+
test_invalid_value("animation-delay-end", "cover");
26+
test_invalid_value("animation-delay-end", "contain");
27+
test_invalid_value("animation-delay-end", "enter");
28+
test_invalid_value("animation-delay-end", "exit");
2929
</script>
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,11 @@
11
<!DOCTYPE html>
2-
<link rel="help" href="https://drafts.csswg.org/scroll-animations-1/#propdef-animation-delay-start">
2+
<link rel="help" href="https://drafts.csswg.org/scroll-animations-1/#propdef-animation-delay-end">
33
<script src="/resources/testharness.js"></script>
44
<script src="/resources/testharnessreport.js"></script>
55
<script src="/css/support/parsing-testcommon.js"></script>
66
<script>
7-
test_valid_value("animation-delay-start", "-5ms");
8-
test_valid_value("animation-delay-start", "0s");
9-
test_valid_value("animation-delay-start", "10s");
10-
test_valid_value("animation-delay-start", "20s, 10s");
11-
12-
// https://drafts.csswg.org/scroll-animations-1/#view-timelines-ranges
13-
test_valid_value("animation-delay-start", "cover 0%");
14-
test_valid_value("animation-delay-start", "cover 100%");
15-
test_valid_value("animation-delay-start", "cover 120%");
16-
test_valid_value("animation-delay-start", "cover 42%");
17-
test_valid_value("animation-delay-start", "cover -42%");
18-
test_valid_value("animation-delay-start", "contain 42%");
19-
test_valid_value("animation-delay-start", "exit 42%");
20-
test_valid_value("animation-delay-start", "exit 1%, cover 2%, contain 100%");
21-
22-
// There's an open issue in the spec about "enter" vs "entry".
23-
//
24-
// https://drafts.csswg.org/scroll-animations-1/#valdef-animation-timeline-range-entry
25-
test_valid_value("animation-delay-start", "enter 42%");
7+
test_valid_value("animation-delay-end", "-5ms");
8+
test_valid_value("animation-delay-end", "0s");
9+
test_valid_value("animation-delay-end", "10s");
10+
test_valid_value("animation-delay-end", "20s, 10s");
2611
</script>

css/css-animations/parsing/animation-delay-shorthand.html

-54
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55
<script src="/resources/testharnessreport.js"></script>
66
<script src="/css/support/shorthand-testcommon.js"></script>
77
<script src="/css/support/parsing-testcommon.js"></script>
8-
</head>
9-
<body>
108
<script>
11-
129
test_valid_value("animation-delay", "1s");
1310
test_valid_value("animation-delay", "-1s");
1411
test_valid_value("animation-delay", "1s 2s");
@@ -17,27 +14,6 @@
1714
test_valid_value("animation-delay", "1s, 2s 3s");
1815
test_valid_value("animation-delay", "1s, 2s, 3s");
1916

20-
test_valid_value("animation-delay", "cover");
21-
test_valid_value("animation-delay", "contain");
22-
test_valid_value("animation-delay", "enter");
23-
test_valid_value("animation-delay", "exit");
24-
test_valid_value("animation-delay", "enter, exit");
25-
26-
test_valid_value("animation-delay", "enter 0% enter 100%", "enter");
27-
test_valid_value("animation-delay", "exit 0% exit 100%", "exit");
28-
test_valid_value("animation-delay", "cover 0% cover 100%", "cover");
29-
test_valid_value("animation-delay", "contain 0% contain 100%", "contain");
30-
31-
test_valid_value("animation-delay", "cover 50%");
32-
test_valid_value("animation-delay", "contain 50%");
33-
test_valid_value("animation-delay", "enter 50%");
34-
test_valid_value("animation-delay", "exit 50%");
35-
36-
test_valid_value("animation-delay", "enter 50% 0s", "enter 50%");
37-
test_valid_value("animation-delay", "0s enter 50%");
38-
test_valid_value("animation-delay", "enter 50% exit 50%");
39-
test_valid_value("animation-delay", "cover 50% enter 50%, contain 50% exit 50%");
40-
4117
test_invalid_value("animation-delay", "1s 2s 3s");
4218
test_invalid_value("animation-delay", "0s, 1s 2s 3s");
4319
test_invalid_value("animation-delay", "1s / 2s");
@@ -61,21 +37,6 @@
6137
'animation-delay-end': '0s',
6238
});
6339

64-
test_shorthand_value('animation-delay', 'cover', {
65-
'animation-delay-start': 'cover 0%',
66-
'animation-delay-end': 'cover 100%',
67-
});
68-
69-
test_shorthand_value('animation-delay', 'contain', {
70-
'animation-delay-start': 'contain 0%',
71-
'animation-delay-end': 'contain 100%',
72-
});
73-
74-
test_shorthand_value('animation-delay', 'enter 10% exit 20%', {
75-
'animation-delay-start': 'enter 10%',
76-
'animation-delay-end': 'exit 20%',
77-
});
78-
7940
test_shorthand_value('animation-delay', '1s 2s, 3s 4s', {
8041
'animation-delay-start': '1s, 3s',
8142
'animation-delay-end': '2s, 4s',
@@ -85,19 +46,4 @@
8546
'animation-delay-start': '1s, 3s, 4s',
8647
'animation-delay-end': '2s, 0s, 5s',
8748
});
88-
89-
test_shorthand_value('animation-delay', 'enter, exit', {
90-
'animation-delay-start': 'enter 0%, exit 0%',
91-
'animation-delay-end': 'enter 100%, exit 100%',
92-
});
93-
94-
test_shorthand_value('animation-delay', 'enter 0%, exit', {
95-
'animation-delay-start': 'enter 0%, exit 0%',
96-
'animation-delay-end': '0s, exit 100%',
97-
});
98-
99-
test_shorthand_value('animation-delay', 'enter 0% 1s, 2s exit 50%', {
100-
'animation-delay-start': 'enter 0%, 2s',
101-
'animation-delay-end': '1s, exit 50%',
102-
});
10349
</script>

css/css-animations/parsing/animation-delay-start-valid.html

-15
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,4 @@
88
test_valid_value("animation-delay-start", "0s");
99
test_valid_value("animation-delay-start", "10s");
1010
test_valid_value("animation-delay-start", "20s, 10s");
11-
12-
// https://drafts.csswg.org/scroll-animations-1/#view-timelines-ranges
13-
test_valid_value("animation-delay-start", "cover 0%");
14-
test_valid_value("animation-delay-start", "cover 100%");
15-
test_valid_value("animation-delay-start", "cover 120%");
16-
test_valid_value("animation-delay-start", "cover 42%");
17-
test_valid_value("animation-delay-start", "cover -42%");
18-
test_valid_value("animation-delay-start", "contain 42%");
19-
test_valid_value("animation-delay-start", "exit 42%");
20-
test_valid_value("animation-delay-start", "exit 1%, cover 2%, contain 100%");
21-
22-
// There's an open issue in the spec about "enter" vs "entry".
23-
//
24-
// https://drafts.csswg.org/scroll-animations-1/#valdef-animation-timeline-range-entry
25-
test_valid_value("animation-delay-start", "enter 42%");
2611
</script>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<!DOCTYPE html>
2+
<link rel="help" href="https://drafts.csswg.org/scroll-animations-1/#propdef-animation-range">
3+
<script src="/resources/testharness.js"></script>
4+
<script src="/resources/testharnessreport.js"></script>
5+
<script src="/css/support/computed-testcommon.js"></script>
6+
<div id="target"></div>
7+
<script>
8+
test_computed_value("animation-range-end", "initial", "auto");
9+
test_computed_value("animation-range-end", "auto");
10+
test_computed_value("animation-range-end", "cover 0%");
11+
test_computed_value("animation-range-end", "COVER 0%", "cover 0%");
12+
test_computed_value("animation-range-end", "cover 100%");
13+
test_computed_value("animation-range-end", "cover 120%");
14+
test_computed_value("animation-range-end", "cover 42%");
15+
test_computed_value("animation-range-end", "cover -42%");
16+
test_computed_value("animation-range-end", "contain 42%");
17+
test_computed_value("animation-range-end", "exit 42%");
18+
test_computed_value("animation-range-end", "exit calc(41% + 1%)", "exit 42%");
19+
test_computed_value("animation-range-end", "exit 1%, cover 2%, contain 100%");
20+
</script>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<!DOCTYPE html>
2+
<link rel="help" href="https://drafts.csswg.org/scroll-animations-1/#propdef-animation-range">
3+
<script src="/resources/testharness.js"></script>
4+
<script src="/resources/testharnessreport.js"></script>
5+
<script src="/css/support/parsing-testcommon.js"></script>
6+
<script>
7+
test_invalid_value("animation-range-end", "infinite");
8+
test_invalid_value("animation-range-end", "0");
9+
test_invalid_value("animation-range-end", "1s 2s");
10+
test_invalid_value("animation-range-end", "1s / 2s");
11+
test_invalid_value("animation-range-end", "100px");
12+
test_invalid_value("animation-range-end", "100%");
13+
14+
test_invalid_value("animation-range-end", "peek 50%");
15+
test_invalid_value("animation-range-end", "50% contain");
16+
test_invalid_value("animation-range-end", "50% cover");
17+
test_invalid_value("animation-range-end", "50% entry");
18+
test_invalid_value("animation-range-end", "50% enter");
19+
test_invalid_value("animation-range-end", "50% exit");
20+
test_invalid_value("animation-range-end", "contain contain");
21+
test_invalid_value("animation-range-end", "none");
22+
test_invalid_value("animation-range-end", "cover 50% enter 50%");
23+
test_invalid_value("animation-range-end", "cover 100px");
24+
test_invalid_value("animation-range-end", "cover");
25+
test_invalid_value("animation-range-end", "contain");
26+
test_invalid_value("animation-range-end", "enter");
27+
test_invalid_value("animation-range-end", "exit");
28+
</script>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<!DOCTYPE html>
2+
<link rel="help" href="https://drafts.csswg.org/scroll-animations-1/#propdef-animation-range">
3+
<script src="/resources/testharness.js"></script>
4+
<script src="/resources/testharnessreport.js"></script>
5+
<script src="/css/support/parsing-testcommon.js"></script>
6+
<script>
7+
// https://drafts.csswg.org/scroll-animations-1/#view-timelines-ranges
8+
test_valid_value("animation-range-end", "auto");
9+
test_valid_value("animation-range-end", "cover 0%");
10+
test_valid_value("animation-range-end", "cover 100%");
11+
test_valid_value("animation-range-end", "cover 120%");
12+
test_valid_value("animation-range-end", "cover 42%");
13+
test_valid_value("animation-range-end", "cover -42%");
14+
test_valid_value("animation-range-end", "contain 42%");
15+
test_valid_value("animation-range-end", "exit 42%");
16+
test_valid_value("animation-range-end", "exit 1%, cover 2%, contain 100%");
17+
18+
// There's an open issue in the spec about "enter" vs "entry".
19+
//
20+
// https://drafts.csswg.org/scroll-animations-1/#valdef-animation-timeline-range-entry
21+
test_valid_value("animation-range-end", "enter 42%");
22+
</script>

0 commit comments

Comments
 (0)