From 05d5eff26cf4e55daa7a7f18d90918f138a71933 Mon Sep 17 00:00:00 2001 From: sagudev Date: Fri, 12 Mar 2021 07:37:31 +0100 Subject: [PATCH 1/8] Update mozjs --- Cargo.lock | 4 ++-- components/script/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0a6235648f5..17119cc382d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3784,7 +3784,7 @@ dependencies = [ [[package]] name = "mozjs" version = "0.14.1" -source = "git+https://github.com/servo/rust-mozjs#b8122da4ea8a48ea21454e65f42d5b2194a2d311" +source = "git+https://github.com/sagudev/rust-mozjs#9cd41246e096a8de7b0377d3028224a97d51ff54" dependencies = [ "cc", "lazy_static", @@ -3797,7 +3797,7 @@ dependencies = [ [[package]] name = "mozjs_sys" version = "0.68.2" -source = "git+https://github.com/servo/mozjs?rev=c6c7b5319975a8f0465ce8c17329e74be4cb80b1#c6c7b5319975a8f0465ce8c17329e74be4cb80b1" +source = "git+https://github.com/sagudev/mozjs?branch=master#931e6f377e27f7bbd28682e5e6378e35fcc8e0a7" dependencies = [ "bindgen", "cc", diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index a09ccf8f257..aa2f1cab024 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -63,7 +63,7 @@ image = "0.23" indexmap = { version = "1.0.2", features = ["std"] } ipc-channel = "0.14" itertools = "0.8" -js = { package = "mozjs", git = "https://github.com/servo/rust-mozjs" } +js = { package = "mozjs", git = "https://github.com/sagudev/rust-mozjs" } jstraceable_derive = { path = "../jstraceable_derive" } keyboard-types = "0.5" lazy_static = "1" From 425057c4323fe9bf3857e2c99912dc10b79166b7 Mon Sep 17 00:00:00 2001 From: sagudev Date: Fri, 12 Mar 2021 16:26:27 +0100 Subject: [PATCH 2/8] Fix errors --- components/script/dom/bindings/interface.rs | 4 ++-- components/script/dom/htmlscriptelement.rs | 7 ++----- components/script/script_module.rs | 8 ++++---- components/script/script_runtime.rs | 12 +++--------- 4 files changed, 11 insertions(+), 20 deletions(-) diff --git a/components/script/dom/bindings/interface.rs b/components/script/dom/bindings/interface.rs index 5fb67c64335..1085a137428 100644 --- a/components/script/dom/bindings/interface.rs +++ b/components/script/dom/bindings/interface.rs @@ -29,7 +29,7 @@ use js::rust::wrappers::JS_FireOnNewGlobalObject; use js::rust::wrappers::RUST_SYMBOL_TO_JSID; use js::rust::wrappers::{JS_DefineProperty, JS_DefineProperty5}; use js::rust::wrappers::{JS_DefineProperty3, JS_DefineProperty4, JS_DefinePropertyById5}; -use js::rust::wrappers::{JS_LinkConstructorAndPrototype, JS_NewObjectWithUniqueType}; +use js::rust::wrappers::{JS_LinkConstructorAndPrototype, JS_NewObjectWithGivenProto}; use js::rust::{define_methods, define_properties, get_object_class}; use js::rust::{HandleObject, HandleValue, MutableHandleObject, RealmOptions}; use std::convert::TryFrom; @@ -316,7 +316,7 @@ pub fn create_object( mut rval: MutableHandleObject, ) { unsafe { - rval.set(JS_NewObjectWithUniqueType(*cx, class, proto)); + rval.set(JS_NewObjectWithGivenProto(*cx, class, proto)); } assert!(!rval.is_null()); define_guarded_methods(cx, rval.handle(), methods, global); diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 0db6ca8cba2..aedb2b719c3 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -66,7 +66,6 @@ use std::io::{Read, Seek, Write}; use std::mem::replace; use std::path::PathBuf; use std::process::Command; -use std::ptr; use std::rc::Rc; use std::sync::{Arc, Mutex}; use style::str::{StaticStringVec, HTML_SPACE_CHARACTERS}; @@ -446,16 +445,14 @@ impl FetchResponseListener for ClassicContext { fetch_options: self.fetch_options.clone(), }); - let mut token = ptr::null_mut(); unsafe { - assert!(CompileOffThread1( + assert!(!CompileOffThread1( *cx, options.ptr as *const _, &mut transform_str_to_source_text(&context.script_text) as *mut _, Some(off_thread_compilation_callback), Box::into_raw(context) as *mut c_void, - &mut token, - )); + ).is_null()); } } else { let load = ScriptOrigin::external( diff --git a/components/script/script_module.rs b/components/script/script_module.rs index 1535b1dd96f..e41a8df31f3 100644 --- a/components/script/script_module.rs +++ b/components/script/script_module.rs @@ -45,14 +45,14 @@ use js::jsapi::Handle as RawHandle; use js::jsapi::HandleObject; use js::jsapi::HandleValue as RawHandleValue; use js::jsapi::Value; -use js::jsapi::{CompileModule1, ExceptionStackBehavior, FinishDynamicModuleImport}; +use js::jsapi::{CompileModule1, ExceptionStackBehavior, FinishDynamicModuleImport_NoTLA}; use js::jsapi::{DynamicImportStatus, SetModuleDynamicImportHook, SetScriptPrivateReferenceHooks}; use js::jsapi::{GetModuleResolveHook, JSRuntime, SetModuleResolveHook}; use js::jsapi::{GetRequestedModules, SetModuleMetadataHook}; use js::jsapi::{Heap, JSContext, JS_ClearPendingException, SetModulePrivate}; use js::jsapi::{JSAutoRealm, JSObject, JSString}; use js::jsapi::{JS_DefineProperty4, JS_IsExceptionPending, JS_NewStringCopyN, JSPROP_ENUMERATE}; -use js::jsapi::{ModuleEvaluate, ModuleInstantiate}; +use js::jsapi::{ThrowOnModuleEvaluationFailure, ModuleInstantiate}; use js::jsval::{JSVal, PrivateValue, UndefinedValue}; use js::rust::jsapi_wrapped::{GetArrayLength, JS_GetElement}; use js::rust::jsapi_wrapped::{GetRequestedModuleSpecifier, JS_GetPendingException}; @@ -505,7 +505,7 @@ impl ModuleTree { let _ac = JSAutoRealm::new(*global.get_cx(), *global.reflector().get_jsobject()); unsafe { - if !ModuleEvaluate(*global.get_cx(), module_record) { + if !ThrowOnModuleEvaluationFailure(*global.get_cx(), module_record) { warn!("fail to evaluate module"); rooted!(in(*global.get_cx()) let mut exception = UndefinedValue()); @@ -1024,7 +1024,7 @@ impl ModuleOwner { debug!("Finishing dynamic import for {:?}", module_identity); unsafe { - FinishDynamicModuleImport( + FinishDynamicModuleImport_NoTLA( *cx, status, module.referencing_private.handle(), diff --git a/components/script/script_runtime.rs b/components/script/script_runtime.rs index f60c42f7e46..ca57b157083 100644 --- a/components/script/script_runtime.rs +++ b/components/script/script_runtime.rs @@ -56,7 +56,7 @@ use js::jsapi::{ }; use js::jsapi::{HandleObject, Heap, JobQueue}; use js::jsapi::{JSContext as RawJSContext, JSTracer, SetDOMCallbacks, SetGCSliceCallback}; -use js::jsapi::{JSGCMode, JSGCParamKey, JS_SetGCParameter, JS_SetGlobalJitCompilerOption}; +use js::jsapi::{JSGCParamKey, JS_SetGCParameter, JS_SetGlobalJitCompilerOption}; use js::jsapi::{ JSJitCompilerOption, JS_SetOffthreadIonCompilationEnabled, JS_SetParallelParsingEnabled, }; @@ -591,14 +591,8 @@ unsafe fn new_rt_and_cx_with_parent( .unwrap_or(u32::max_value()), ); // NOTE: This is disabled above, so enabling it here will do nothing for now. - let js_gc_mode = if pref!(js.mem.gc.incremental.enabled) { - JSGCMode::JSGC_MODE_INCREMENTAL - } else if pref!(js.mem.gc.per_zone.enabled) { - JSGCMode::JSGC_MODE_ZONE - } else { - JSGCMode::JSGC_MODE_GLOBAL - }; - JS_SetGCParameter(cx, JSGCParamKey::JSGC_MODE, js_gc_mode as u32); + JS_SetGCParameter(cx, JSGCParamKey::JSGC_INCREMENTAL_GC_ENABLED, pref!(js.mem.gc.incremental.enabled) as u32); + JS_SetGCParameter(cx, JSGCParamKey::JSGC_PER_ZONE_GC_ENABLED, pref!(js.mem.gc.per_zone.enabled) as u32); if let Some(val) = in_range(pref!(js.mem.gc.incremental.slice_ms), 0, 100_000) { JS_SetGCParameter(cx, JSGCParamKey::JSGC_SLICE_TIME_BUDGET_MS, val as u32); } From a265a2a7e6c53eda558aa61712646382bbe129af Mon Sep 17 00:00:00 2001 From: sagudev Date: Fri, 12 Mar 2021 18:30:13 +0100 Subject: [PATCH 3/8] Formating --- components/script/dom/htmlscriptelement.rs | 3 ++- components/script/script_module.rs | 2 +- components/script/script_runtime.rs | 12 ++++++++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index aedb2b719c3..d27fee98fb5 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -452,7 +452,8 @@ impl FetchResponseListener for ClassicContext { &mut transform_str_to_source_text(&context.script_text) as *mut _, Some(off_thread_compilation_callback), Box::into_raw(context) as *mut c_void, - ).is_null()); + ) + .is_null()); } } else { let load = ScriptOrigin::external( diff --git a/components/script/script_module.rs b/components/script/script_module.rs index e41a8df31f3..9f2f2a2e506 100644 --- a/components/script/script_module.rs +++ b/components/script/script_module.rs @@ -52,7 +52,7 @@ use js::jsapi::{GetRequestedModules, SetModuleMetadataHook}; use js::jsapi::{Heap, JSContext, JS_ClearPendingException, SetModulePrivate}; use js::jsapi::{JSAutoRealm, JSObject, JSString}; use js::jsapi::{JS_DefineProperty4, JS_IsExceptionPending, JS_NewStringCopyN, JSPROP_ENUMERATE}; -use js::jsapi::{ThrowOnModuleEvaluationFailure, ModuleInstantiate}; +use js::jsapi::{ModuleInstantiate, ThrowOnModuleEvaluationFailure}; use js::jsval::{JSVal, PrivateValue, UndefinedValue}; use js::rust::jsapi_wrapped::{GetArrayLength, JS_GetElement}; use js::rust::jsapi_wrapped::{GetRequestedModuleSpecifier, JS_GetPendingException}; diff --git a/components/script/script_runtime.rs b/components/script/script_runtime.rs index ca57b157083..c44b4b04676 100644 --- a/components/script/script_runtime.rs +++ b/components/script/script_runtime.rs @@ -591,8 +591,16 @@ unsafe fn new_rt_and_cx_with_parent( .unwrap_or(u32::max_value()), ); // NOTE: This is disabled above, so enabling it here will do nothing for now. - JS_SetGCParameter(cx, JSGCParamKey::JSGC_INCREMENTAL_GC_ENABLED, pref!(js.mem.gc.incremental.enabled) as u32); - JS_SetGCParameter(cx, JSGCParamKey::JSGC_PER_ZONE_GC_ENABLED, pref!(js.mem.gc.per_zone.enabled) as u32); + JS_SetGCParameter( + cx, + JSGCParamKey::JSGC_INCREMENTAL_GC_ENABLED, + pref!(js.mem.gc.incremental.enabled) as u32, + ); + JS_SetGCParameter( + cx, + JSGCParamKey::JSGC_PER_ZONE_GC_ENABLED, + pref!(js.mem.gc.per_zone.enabled) as u32, + ); if let Some(val) = in_range(pref!(js.mem.gc.incremental.slice_ms), 0, 100_000) { JS_SetGCParameter(cx, JSGCParamKey::JSGC_SLICE_TIME_BUDGET_MS, val as u32); } From d424eaae91919e9e2653c5deb3069e4c00a2d1b3 Mon Sep 17 00:00:00 2001 From: sagudev Date: Sat, 13 Mar 2021 12:56:41 +0100 Subject: [PATCH 4/8] Fix ModuleEvaluate --- components/script/script_module.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/script/script_module.rs b/components/script/script_module.rs index 9f2f2a2e506..5ae134cdcd9 100644 --- a/components/script/script_module.rs +++ b/components/script/script_module.rs @@ -52,7 +52,7 @@ use js::jsapi::{GetRequestedModules, SetModuleMetadataHook}; use js::jsapi::{Heap, JSContext, JS_ClearPendingException, SetModulePrivate}; use js::jsapi::{JSAutoRealm, JSObject, JSString}; use js::jsapi::{JS_DefineProperty4, JS_IsExceptionPending, JS_NewStringCopyN, JSPROP_ENUMERATE}; -use js::jsapi::{ModuleInstantiate, ThrowOnModuleEvaluationFailure}; +use js::jsapi::{ModuleInstantiate, ModuleEvaluate}; use js::jsval::{JSVal, PrivateValue, UndefinedValue}; use js::rust::jsapi_wrapped::{GetArrayLength, JS_GetElement}; use js::rust::jsapi_wrapped::{GetRequestedModuleSpecifier, JS_GetPendingException}; @@ -505,7 +505,8 @@ impl ModuleTree { let _ac = JSAutoRealm::new(*global.get_cx(), *global.reflector().get_jsobject()); unsafe { - if !ThrowOnModuleEvaluationFailure(*global.get_cx(), module_record) { + rooted!(in(*global.get_cx()) let mut rval = UndefinedValue()); + if !ModuleEvaluate(*global.get_cx(), module_record, rval.handle_mut().into()) { warn!("fail to evaluate module"); rooted!(in(*global.get_cx()) let mut exception = UndefinedValue()); From d8c398c457baaa48557f8d20cdd27c1e1963aa72 Mon Sep 17 00:00:00 2001 From: sagudev Date: Sat, 13 Mar 2021 13:00:50 +0100 Subject: [PATCH 5/8] fmt --- components/script/script_module.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/script/script_module.rs b/components/script/script_module.rs index 5ae134cdcd9..dbd1431b5e4 100644 --- a/components/script/script_module.rs +++ b/components/script/script_module.rs @@ -52,7 +52,7 @@ use js::jsapi::{GetRequestedModules, SetModuleMetadataHook}; use js::jsapi::{Heap, JSContext, JS_ClearPendingException, SetModulePrivate}; use js::jsapi::{JSAutoRealm, JSObject, JSString}; use js::jsapi::{JS_DefineProperty4, JS_IsExceptionPending, JS_NewStringCopyN, JSPROP_ENUMERATE}; -use js::jsapi::{ModuleInstantiate, ModuleEvaluate}; +use js::jsapi::{ModuleEvaluate, ModuleInstantiate}; use js::jsval::{JSVal, PrivateValue, UndefinedValue}; use js::rust::jsapi_wrapped::{GetArrayLength, JS_GetElement}; use js::rust::jsapi_wrapped::{GetRequestedModuleSpecifier, JS_GetPendingException}; From 337cc181b8471411c53442f0b94737e37d20a044 Mon Sep 17 00:00:00 2001 From: sagudev Date: Mon, 15 Mar 2021 06:22:20 +0100 Subject: [PATCH 6/8] Update cargo.lock --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 17119cc382d..082fba590e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3797,7 +3797,7 @@ dependencies = [ [[package]] name = "mozjs_sys" version = "0.68.2" -source = "git+https://github.com/sagudev/mozjs?branch=master#931e6f377e27f7bbd28682e5e6378e35fcc8e0a7" +source = "git+https://github.com/sagudev/mozjs?branch=master#90bd6a8ed2b7ce6e4b738b05aa672cd791329116" dependencies = [ "bindgen", "cc", From 75d9a122b63f92f770b0c126c70d8213a28569b6 Mon Sep 17 00:00:00 2001 From: sagudev Date: Mon, 15 Mar 2021 06:56:11 +0100 Subject: [PATCH 7/8] Update test results. --- .../CSS2/floats/hit-test-floats-002.html.ini | 4 ++ .../elementFromPoint-list-001.html.ini | 3 + .../elementsFromPoint-invalid-cases.html.ini | 4 -- ...url-return-value-handling-dynamic.html.ini | 12 ++++ .../textfieldselection/select-event.html.ini | 71 ++++++++----------- .../constructor-reftypes.tentative.any.js.ini | 21 ------ .../wasm/jsapi/table/constructor.any.js.ini | 9 +++ .../wasm/jsapi/table/get-set.any.js.ini | 9 +++ .../table/set-reftypes.tentative.any.js.ini | 15 ---- .../webmessaging/without-ports/018.html.ini | 5 ++ 10 files changed, 70 insertions(+), 83 deletions(-) create mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini delete mode 100644 tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini delete mode 100644 tests/wpt/metadata/wasm/jsapi/table/constructor-reftypes.tentative.any.js.ini create mode 100644 tests/wpt/metadata/wasm/jsapi/table/constructor.any.js.ini create mode 100644 tests/wpt/metadata/wasm/jsapi/table/get-set.any.js.ini delete mode 100644 tests/wpt/metadata/wasm/jsapi/table/set-reftypes.tentative.any.js.ini create mode 100644 tests/wpt/metadata/webmessaging/without-ports/018.html.ini diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini new file mode 100644 index 00000000000..f64b45fea6b --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini @@ -0,0 +1,4 @@ +[hit-test-floats-002.html] + [Hit test float] + expected: FAIL + diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini index 668c3f52a5b..03e29750425 100644 --- a/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini +++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini @@ -14,3 +14,6 @@ [
  • Outside 3
    • ] expected: FAIL + [
  • Inside 3
    • ] + expected: FAIL + diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini deleted file mode 100644 index e181af5397f..00000000000 --- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[elementsFromPoint-invalid-cases.html] - [The root element is the last element returned for otherwise empty queries within the viewport] - expected: FAIL - diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini index 4c5287a46be..87798a1d9c0 100644 --- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini +++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini @@ -5,3 +5,15 @@ [Test javascript URL string return values in direct and indirect (target) frame contexts. 9] expected: FAIL + [Test javascript URL string return values in direct and indirect (target) frame contexts. 5] + expected: FAIL + + [Test javascript URL string return values in direct and indirect (target) frame contexts. 6] + expected: FAIL + + [Test javascript URL string return values in direct and indirect (target) frame contexts. 7] + expected: FAIL + + [Test javascript URL string return values in direct and indirect (target) frame contexts. 8] + expected: FAIL + diff --git a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini index a5ce20f7b87..1e84a603e36 100644 --- a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini +++ b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini @@ -2,54 +2,21 @@ [input type search: setSelectionRange out of range a second time (must not fire select)] expected: FAIL - [input type url: setSelectionRange() a second time (must not fire select)] - expected: FAIL - - [input type text: selectionStart a second time (must not fire select)] - expected: FAIL - - [input type search: setRangeText() a second time (must not fire select)] - expected: FAIL - - [input type url: selectionDirection a second time (must not fire select)] - expected: FAIL - [input type url: selectionStart out of range a second time (must not fire select)] expected: FAIL - [textarea: selectionEnd a second time (must not fire select)] - expected: FAIL - - [input type tel: select() a second time (must not fire select)] - expected: FAIL - - [input type url: select() a second time (must not fire select)] - expected: FAIL - [input type password: selectionEnd out of range a second time (must not fire select)] expected: FAIL [input type text: selectionEnd out of range a second time (must not fire select)] expected: FAIL - [input type tel: selectionStart out of range a second time (must not fire select)] - expected: FAIL - [input type tel: selectionEnd out of range a second time (must not fire select)] expected: FAIL - [input type url: setRangeText() a second time (must not fire select)] - expected: FAIL - [textarea: selectionStart out of range a second time (must not fire select)] expected: FAIL - [textarea: selectionEnd out of range a second time (must not fire select)] - expected: FAIL - - [textarea: setSelectionRange out of range a second time (must not fire select)] - expected: FAIL - [input type text: selectionStart out of range a second time (must not fire select)] expected: FAIL @@ -59,21 +26,39 @@ [input type search: setSelectionRange() a second time (must not fire select)] expected: FAIL - [input type tel: selectionEnd a second time (must not fire select)] - expected: FAIL - - [input type tel: setSelectionRange() a second time (must not fire select)] - expected: FAIL - - [input type url: selectionStart a second time (must not fire select)] - expected: FAIL - [input type url: setSelectionRange out of range a second time (must not fire select)] expected: FAIL [input type password: select() a second time (must not fire select)] expected: FAIL - [input type password: selectionDirection a second time (must not fire select)] + [textarea: setRangeText() a second time (must not fire select)] + expected: FAIL + + [input type text: selectionEnd a second time (must not fire select)] + expected: FAIL + + [input type text: selectionDirection a second time (must not fire select)] + expected: FAIL + + [input type text: setRangeText() a second time (must not fire select)] + expected: FAIL + + [input type search: selectionStart a second time (must not fire select)] + expected: FAIL + + [input type search: selectionEnd a second time (must not fire select)] + expected: FAIL + + [input type tel: setRangeText() a second time (must not fire select)] + expected: FAIL + + [input type tel: setSelectionRange out of range a second time (must not fire select)] + expected: FAIL + + [input type password: selectionStart a second time (must not fire select)] + expected: FAIL + + [input type password: setRangeText() a second time (must not fire select)] expected: FAIL diff --git a/tests/wpt/metadata/wasm/jsapi/table/constructor-reftypes.tentative.any.js.ini b/tests/wpt/metadata/wasm/jsapi/table/constructor-reftypes.tentative.any.js.ini deleted file mode 100644 index 3935496d6ef..00000000000 --- a/tests/wpt/metadata/wasm/jsapi/table/constructor-reftypes.tentative.any.js.ini +++ /dev/null @@ -1,21 +0,0 @@ -[constructor-reftypes.tentative.any.html] - [initialize anyfunc table with a bad default value] - expected: FAIL - - [initialize externref table with default value] - expected: FAIL - - [initialize anyfunc table with default value] - expected: FAIL - - -[constructor-reftypes.tentative.any.worker.html] - [initialize anyfunc table with a bad default value] - expected: FAIL - - [initialize externref table with default value] - expected: FAIL - - [initialize anyfunc table with default value] - expected: FAIL - diff --git a/tests/wpt/metadata/wasm/jsapi/table/constructor.any.js.ini b/tests/wpt/metadata/wasm/jsapi/table/constructor.any.js.ini new file mode 100644 index 00000000000..5e23cff4e1e --- /dev/null +++ b/tests/wpt/metadata/wasm/jsapi/table/constructor.any.js.ini @@ -0,0 +1,9 @@ +[constructor.any.html] + [Stray argument] + expected: FAIL + + +[constructor.any.worker.html] + [Stray argument] + expected: FAIL + diff --git a/tests/wpt/metadata/wasm/jsapi/table/get-set.any.js.ini b/tests/wpt/metadata/wasm/jsapi/table/get-set.any.js.ini new file mode 100644 index 00000000000..b5ab690dbe5 --- /dev/null +++ b/tests/wpt/metadata/wasm/jsapi/table/get-set.any.js.ini @@ -0,0 +1,9 @@ +[get-set.any.worker.html] + [Missing arguments: set] + expected: FAIL + + +[get-set.any.html] + [Missing arguments: set] + expected: FAIL + diff --git a/tests/wpt/metadata/wasm/jsapi/table/set-reftypes.tentative.any.js.ini b/tests/wpt/metadata/wasm/jsapi/table/set-reftypes.tentative.any.js.ini deleted file mode 100644 index dd417d75980..00000000000 --- a/tests/wpt/metadata/wasm/jsapi/table/set-reftypes.tentative.any.js.ini +++ /dev/null @@ -1,15 +0,0 @@ -[set-reftypes.tentative.any.worker.html] - [Arguments for externref table set] - expected: FAIL - - [Arguments for anyfunc table set] - expected: FAIL - - -[set-reftypes.tentative.any.html] - [Arguments for externref table set] - expected: FAIL - - [Arguments for anyfunc table set] - expected: FAIL - diff --git a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini new file mode 100644 index 00000000000..663a1f8fa30 --- /dev/null +++ b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini @@ -0,0 +1,5 @@ +[018.html] + expected: TIMEOUT + [origin of the script that invoked the method, javascript:] + expected: TIMEOUT + From c8921e1c6ceff9ea0ed53dd8ceaf3877603e45d0 Mon Sep 17 00:00:00 2001 From: sagudev Date: Tue, 16 Mar 2021 07:21:16 +0100 Subject: [PATCH 8/8] Update source repo --- Cargo.lock | 4 ++-- components/script/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8f3da9f7ba3..df14033e732 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3825,7 +3825,7 @@ dependencies = [ [[package]] name = "mozjs" version = "0.14.1" -source = "git+https://github.com/sagudev/rust-mozjs#9cd41246e096a8de7b0377d3028224a97d51ff54" +source = "git+https://github.com/servo/rust-mozjs#fe104a26147a42f6267286cd856361a126ab733b" dependencies = [ "cc", "lazy_static", @@ -3838,7 +3838,7 @@ dependencies = [ [[package]] name = "mozjs_sys" version = "0.68.2" -source = "git+https://github.com/sagudev/mozjs?branch=master#90bd6a8ed2b7ce6e4b738b05aa672cd791329116" +source = "git+https://github.com/servo/mozjs?rev=82da136c53d7ca7b0b7fe1c5622627036ef31899#82da136c53d7ca7b0b7fe1c5622627036ef31899" dependencies = [ "bindgen", "cc", diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index aa2f1cab024..a09ccf8f257 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -63,7 +63,7 @@ image = "0.23" indexmap = { version = "1.0.2", features = ["std"] } ipc-channel = "0.14" itertools = "0.8" -js = { package = "mozjs", git = "https://github.com/sagudev/rust-mozjs" } +js = { package = "mozjs", git = "https://github.com/servo/rust-mozjs" } jstraceable_derive = { path = "../jstraceable_derive" } keyboard-types = "0.5" lazy_static = "1"