diff options
6 files changed, 12 insertions, 271 deletions
diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index 9b16b0348d7..aa7443ce018 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/components/script/dom/dedicatedworkerglobalscope.rs @@ -347,10 +347,14 @@ impl DedicatedWorkerGlobalScope { let runtime = unsafe { if let Some(pipeline_id) = pipeline_id { - new_child_runtime( - parent, - Some(NetworkingTaskSource(parent_sender.clone(), pipeline_id)), - ) + let task_source = NetworkingTaskSource( + Box::new(WorkerThreadWorkerChan { + sender: own_sender.clone(), + worker: worker.clone(), + }), + pipeline_id, + ); + new_child_runtime(parent, Some(task_source)) } else { new_child_runtime(parent, None) } diff --git a/tests/wpt/metadata/wasm/jsapi/constructor/compile.any.js.ini b/tests/wpt/metadata/wasm/jsapi/constructor/compile.any.js.ini deleted file mode 100644 index 4f560c157f2..00000000000 --- a/tests/wpt/metadata/wasm/jsapi/constructor/compile.any.js.ini +++ /dev/null @@ -1,22 +0,0 @@ -[compile.any.worker.html] - expected: CRASH - [Invalid code] - expected: NOTRUN - - [Branding] - expected: TIMEOUT - - [Result type] - expected: NOTRUN - - [Changing the buffer] - expected: NOTRUN - - [Stray argument] - expected: NOTRUN - - [Empty buffer] - expected: NOTRUN - - -[compile.any.html] diff --git a/tests/wpt/metadata/wasm/jsapi/constructor/instantiate-bad-imports.any.js.ini b/tests/wpt/metadata/wasm/jsapi/constructor/instantiate-bad-imports.any.js.ini deleted file mode 100644 index 83a4eb4e402..00000000000 --- a/tests/wpt/metadata/wasm/jsapi/constructor/instantiate-bad-imports.any.js.ini +++ /dev/null @@ -1,169 +0,0 @@ -[instantiate-bad-imports.any.html] - -[instantiate-bad-imports.any.worker.html] - expected: CRASH - [WebAssembly.instantiate(buffer): Imports argument with missing property: wrong property] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing memory with an incorrectly-typed value: 1] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing memory with an incorrectly-typed value: undefined] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing a function with an incorrectly-typed value: true] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing memory with an incorrectly-typed value: ""] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing an i64 global] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing a function with an incorrectly-typed value: NaN] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Non-object module: 1] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing a global with an incorrectly-typed value: symbol "Symbol()"] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing memory with an incorrectly-typed value: WebAssembly.Memory.prototype] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing a function with an incorrectly-typed value: 0.1] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing a function with an incorrectly-typed value: object "[object Object\]"] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing a global with an incorrectly-typed value: WebAssembly.Global.prototype] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing memory with an incorrectly-typed value: symbol "Symbol()"] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing table with an incorrectly-typed value: 0.1] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing table with an incorrectly-typed value: true] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Imports argument with missing property: undefined] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing table with an incorrectly-typed value: ""] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing a function with an incorrectly-typed value: symbol "Symbol()"] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Imports argument with missing property: empty object] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Non-object module: 0.1] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing a global with an incorrectly-typed value: true] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Non-object module: NaN] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Non-object module: true] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing a global with an incorrectly-typed value: null] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing a global with an incorrectly-typed value: Object.create(WebAssembly.Global.prototype)] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing a function with an incorrectly-typed value: undefined] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Missing imports argument] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing memory with an incorrectly-typed value: null] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing table with an incorrectly-typed value: Object.create(WebAssembly.Table.prototype)] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Non-object module: undefined] - expected: TIMEOUT - - [WebAssembly.instantiate(buffer): Importing table with an incorrectly-typed value: WebAssembly.Table] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Non-object module: ""] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing a function with an incorrectly-typed value: ""] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing table with an incorrectly-typed value: plain object] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing a global with an incorrectly-typed value: plain object] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing a function with an incorrectly-typed value: 1] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing table with an incorrectly-typed value: null] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing table with an incorrectly-typed value: undefined] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing table with an incorrectly-typed value: 1] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing table with an incorrectly-typed value: WebAssembly.Table.prototype] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing memory with an incorrectly-typed value: Object.create(WebAssembly.Memory.prototype)] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing memory with an incorrectly-typed value: 0.1] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing memory with an incorrectly-typed value: true] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing a global with an incorrectly-typed value: WebAssembly.Global] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Non-object module: symbol "Symbol()"] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing memory with an incorrectly-typed value: NaN] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing a global with an incorrectly-typed value: ""] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing a global with an incorrectly-typed value: undefined] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing table with an incorrectly-typed value: NaN] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing a function with an incorrectly-typed value: null] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Non-object module: null] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing memory with an incorrectly-typed value: plain object] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing table with an incorrectly-typed value: symbol "Symbol()"] - expected: NOTRUN - - [WebAssembly.instantiate(buffer): Importing memory with an incorrectly-typed value: WebAssembly.Memory] - expected: NOTRUN - diff --git a/tests/wpt/metadata/wasm/jsapi/constructor/instantiate.any.js.ini b/tests/wpt/metadata/wasm/jsapi/constructor/instantiate.any.js.ini index 18bb636c20c..1ab23d6de8b 100644 --- a/tests/wpt/metadata/wasm/jsapi/constructor/instantiate.any.js.ini +++ b/tests/wpt/metadata/wasm/jsapi/constructor/instantiate.any.js.ini @@ -10,82 +10,12 @@ [instantiate.any.worker.html] - expected: CRASH - [Invalid arguments] - expected: NOTRUN - [exports and imports: buffer argument] expected: FAIL - [Invalid code] - expected: NOTRUN - [BufferSource argument] expected: FAIL - [Branding] - expected: TIMEOUT - - [exports and imports: Module argument] - expected: NOTRUN - [Module argument] expected: FAIL - [Changing the buffer] - expected: NOTRUN - - [Empty module with undefined imports argument: BufferSource argument] - expected: NOTRUN - - [getter order for imports object: BufferSource argument] - expected: NOTRUN - - [Empty module without imports argument: BufferSource argument] - expected: NOTRUN - - [Empty module with empty imports argument: BufferSource argument] - expected: NOTRUN - - [No imports: Module argument] - expected: NOTRUN - - [Empty module with undefined imports argument: Module argument] - expected: NOTRUN - - [exports and imports: BufferSource argument] - expected: NOTRUN - - [imports: Module argument] - expected: NOTRUN - - [Empty module without imports argument: Module argument] - expected: NOTRUN - - [No imports: BufferSource argument] - expected: NOTRUN - - [Empty module with empty imports argument: Module argument] - expected: NOTRUN - - [imports: BufferSource argument] - expected: NOTRUN - - [getter order for imports object: Module argument] - expected: NOTRUN - - [stray argument: BufferSource argument] - expected: NOTRUN - - [stray argument: Module argument] - expected: NOTRUN - - [Empty buffer] - expected: NOTRUN - - [Synchronous options handling: Module argument] - expected: NOTRUN - - [Synchronous options handling: Buffer argument] - expected: NOTRUN - diff --git a/tests/wpt/metadata/wasm/jsapi/constructor/multi-value.any.js.ini b/tests/wpt/metadata/wasm/jsapi/constructor/multi-value.any.js.ini index a0ba4264219..54d4a21034d 100644 --- a/tests/wpt/metadata/wasm/jsapi/constructor/multi-value.any.js.ini +++ b/tests/wpt/metadata/wasm/jsapi/constructor/multi-value.any.js.ini @@ -1,13 +1,12 @@ [multi-value.any.worker.html] - expected: CRASH [multiple return values from wasm to js] - expected: TIMEOUT + expected: FAIL [multiple return values inside wasm] - expected: NOTRUN + expected: FAIL [multiple return values from js to wasm] - expected: NOTRUN + expected: FAIL [multi-value.any.html] diff --git a/tests/wpt/metadata/wasm/serialization/module/nested-worker-success.any.js.ini b/tests/wpt/metadata/wasm/serialization/module/nested-worker-success.any.js.ini index 89e52e3728d..d92318b2c32 100644 --- a/tests/wpt/metadata/wasm/serialization/module/nested-worker-success.any.js.ini +++ b/tests/wpt/metadata/wasm/serialization/module/nested-worker-success.any.js.ini @@ -5,7 +5,6 @@ [nested-worker-success.any.worker.html] - expected: CRASH [postMessaging to a dedicated sub-worker allows them to see each others' modifications] - expected: TIMEOUT + expected: FAIL |