Skip to content

Commit 67880a4

Browse files
ptomatoMs2ger
ptomato
authored and
Ms2ger
committed
Improve idlharness-ShadowRealm integration
By exposing a fetch_spec() on globalThis in testharness-shadowrealm-inner, we no longer need to have IDL tests in separate files for ShadowRealm, as the regular idlharness.js will just run there. Delete all existing idlharness-shadowrealm.window.js files and incorporate them into their neighbouring idlharness.any.js files. It seems sufficient to run the IDL tests only in shadowrealm-in-window; repeating them in every ShadowRealm scope seems like overkill.
1 parent ebb12b1 commit 67880a4

27 files changed

+45
-113
lines changed

‎compression/idlharness-shadowrealm.window.js

-3
This file was deleted.

‎compression/idlharness.https.any.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// META: script=/resources/WebIDLParser.js
22
// META: script=/resources/idlharness.js
3+
// META: global=window,dedicatedworker,shadowrealm-in-window
34

45
'use strict';
56

‎console/idlharness-shadowrealm.window.js

-6
This file was deleted.

‎console/idlharness.any.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// META: script=/resources/WebIDLParser.js
22
// META: script=/resources/idlharness.js
3+
// META: global=window,dedicatedworker,shadowrealm-in-window
34

45
// https://console.spec.whatwg.org/
56

‎dom/idlharness-shadowrealm.window.js

-3
This file was deleted.

‎dom/idlharness.any.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// META: global=worker
1+
// META: global=worker,shadowrealm-in-window
22
// META: script=/resources/WebIDLParser.js
33
// META: script=/resources/idlharness.js
44
// META: timeout=long

‎encoding/idlharness-shadowrealm.window.js

-3
This file was deleted.

‎encoding/idlharness.any.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// META: global=window,worker
1+
// META: global=window,worker,shadowrealm-in-window
22
// META: script=/resources/WebIDLParser.js
33
// META: script=/resources/idlharness.js
44

‎hr-time/idlharness-shadowrealm.window.js

-3
This file was deleted.

‎hr-time/idlharness.any.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// META: global=window,worker
1+
// META: global=window,worker,shadowrealm-in-window
22
// META: script=/resources/WebIDLParser.js
33
// META: script=/resources/idlharness.js
44
// META: timeout=long
@@ -11,6 +11,10 @@ idl_test(
1111
['hr-time'],
1212
['html', 'dom'],
1313
async idl_array => {
14+
if (self.GLOBAL.isShadowRealm()) {
15+
return;
16+
}
17+
1418
if (self.GLOBAL.isWorker()) {
1519
idl_array.add_objects({ WorkerGlobalScope: ['self'] });
1620
} else {

‎html/dom/idlharness-shadowrealm.window.js

-3
This file was deleted.

‎html/dom/idlharness.worker.js ‎html/dom/idlharness.any.js

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1-
"use strict";
1+
// META: global=dedicatedworker,shadowrealm-in-window
2+
// META: script=/resources/WebIDLParser.js
3+
// META: script=/resources/idlharness.js
24

3-
importScripts("/resources/testharness.js");
4-
importScripts("/resources/WebIDLParser.js", "/resources/idlharness.js");
5+
"use strict";
56

67
idl_test(
78
["html"],
89
["wai-aria", "dom", "cssom", "touch-events", "uievents", "performance-timeline"],
910
idlArray => {
11+
if (self.GLOBAL.isShadowRealm()) {
12+
return;
13+
}
14+
1015
idlArray.add_untested_idls('typedef Window WindowProxy;');
1116
idlArray.add_objects({
1217
WorkerLocation: ['self.location'],
@@ -18,5 +23,3 @@ idl_test(
1823
});
1924
}
2025
);
21-
22-
done();

‎performance-timeline/idlharness-shadowrealm.window.js

-3
This file was deleted.

‎performance-timeline/idlharness.any.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// META: global=window,worker
1+
// META: global=window,worker,shadowrealm-in-window
22
// META: script=/resources/WebIDLParser.js
33
// META: script=/resources/idlharness.js
44

@@ -10,6 +10,10 @@ idl_test(
1010
['performance-timeline'],
1111
['hr-time', 'dom'],
1212
async idl_array => {
13+
if (self.GLOBAL.isShadowRealm()) {
14+
return;
15+
}
16+
1317
idl_array.add_objects({
1418
Performance: ['performance'],
1519
PerformanceObserver: ['observer'],

‎resources/idlharness-shadowrealm.js

-52
This file was deleted.

‎resources/idlharness.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -3498,7 +3498,7 @@ function idl_test(srcs, deps, idl_setup_func) {
34983498
"require-exposed"
34993499
];
35003500
return Promise.all(
3501-
srcs.concat(deps).map(fetch_spec))
3501+
srcs.concat(deps).map(globalThis.fetch_spec))
35023502
.then(function(results) {
35033503
const astArray = results.map(result =>
35043504
WebIDL2.parse(result.idl, { sourceName: result.spec })
@@ -3539,9 +3539,11 @@ function idl_test(srcs, deps, idl_setup_func) {
35393539
});
35403540
}, 'idl_test setup');
35413541
}
3542+
globalThis.idl_test = idl_test;
35423543

35433544
/**
35443545
* fetch_spec is a shorthand for a Promise that fetches the spec's content.
3546+
* Note: ShadowRealm-specific implementation in testharness-shadowrealm-inner.js
35453547
*/
35463548
function fetch_spec(spec) {
35473549
var url = '/interfaces/' + spec + '.idl';

‎resources/testharness-shadowrealm-inner.js

+11
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,17 @@ globalThis.setShadowRealmGlobalProperties = function (queryString, fetchAdaptor)
1717
return new Promise(executor).then((s) => JSON.parse(s));
1818
};
1919

20+
// Used only by idlharness.js
21+
globalThis.fetch_spec = (spec) => {
22+
const resource = `/interfaces/${spec}.idl`;
23+
const executor = fetchAdaptor(resource);
24+
return new Promise(executor).then(
25+
idl => ({ spec, idl }),
26+
() => {
27+
throw new IdlHarnessError(`Error fetching ${resource}.`);
28+
});
29+
}
30+
2031
globalThis.location = { search: queryString };
2132
};
2233

‎streams/idlharness-shadowrealm.window.js

-3
This file was deleted.

‎streams/idlharness.any.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// META: global=window,worker
1+
// META: global=window,worker,shadowrealm-in-window
22
// META: script=/resources/WebIDLParser.js
33
// META: script=/resources/idlharness.js
44
// META: timeout=long

‎url/idlharness-shadowrealm.window.js

-3
This file was deleted.

‎url/idlharness.any.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// META: script=/resources/WebIDLParser.js
22
// META: script=/resources/idlharness.js
3+
// META: global=window,dedicatedworker,shadowrealm-in-window
34

45
idl_test(
56
['url'],

‎user-timing/idlharness-shadowrealm.window.js

-3
This file was deleted.

‎user-timing/idlharness.any.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// META: global=window,worker
1+
// META: global=window,worker,shadowrealm-in-window
22
// META: script=/resources/WebIDLParser.js
33
// META: script=/resources/idlharness.js
44
// META: timeout=long
@@ -11,6 +11,10 @@ idl_test(
1111
['user-timing'],
1212
['hr-time', 'performance-timeline', 'dom'],
1313
idl_array => {
14+
if (self.GLOBAL.isShadowRealm()) {
15+
return;
16+
}
17+
1418
try {
1519
performance.mark('test');
1620
performance.measure('test');

‎wasm/jsapi/idlharness-shadowrealm.window.js

-3
This file was deleted.

‎wasm/jsapi/idlharness.any.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// META: script=/resources/WebIDLParser.js
22
// META: script=/resources/idlharness.js
33
// META: script=../resources/load_wasm.js
4+
// META: global=window,dedicatedworker,shadowrealm-in-window
45

56
'use strict';
67

‎webidl/idlharness-shadowrealm.window.js

-13
This file was deleted.

‎webidl/idlharness.any.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// META: script=/resources/WebIDLParser.js
22
// META: script=/resources/idlharness.js
3+
// META: global=window,dedicatedworker,shadowrealm-in-window
34

45
"use strict";
56

0 commit comments

Comments
 (0)