diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs index c3f6bf66971..c9cbbae2723 100644 --- a/components/script/dom/bindings/utils.rs +++ b/components/script/dom/bindings/utils.rs @@ -116,7 +116,7 @@ impl Clone for DOMJSClass { } unsafe impl Sync for DOMJSClass {} -/// Returns a JSVal representing a frozen array of ports +/// Returns a JSVal representing the frozen JavaScript array pub fn to_frozen_array(convertibles: &[T], cx: SafeJSContext) -> JSVal { rooted!(in(*cx) let mut ports = UndefinedValue()); unsafe { convertibles.to_jsval(*cx, ports.handle_mut()) }; diff --git a/components/script/dom/xrinputsourceschangeevent.rs b/components/script/dom/xrinputsourceschangeevent.rs index b44bc17382a..dc28cefa812 100644 --- a/components/script/dom/xrinputsourceschangeevent.rs +++ b/components/script/dom/xrinputsourceschangeevent.rs @@ -3,9 +3,8 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ use dom_struct::dom_struct; -use js::conversions::ToJSValConvertible; use js::jsapi::Heap; -use js::jsval::{JSVal, UndefinedValue}; +use js::jsval::JSVal; use js::rust::HandleObject; use servo_atoms::Atom; @@ -17,6 +16,7 @@ use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; +use crate::dom::bindings::utils::to_frozen_array; use crate::dom::event::Event; use crate::dom::globalscope::GlobalScope; use crate::dom::window::Window; @@ -87,15 +87,8 @@ impl XRInputSourcesChangeEvent { } let _ac = enter_realm(global); let cx = GlobalScope::get_cx(); - unsafe { - rooted!(in(*cx) let mut added_val = UndefinedValue()); - added.to_jsval(*cx, added_val.handle_mut()); - changeevent.added.set(added_val.get()); - rooted!(in(*cx) let mut removed_val = UndefinedValue()); - removed.to_jsval(*cx, removed_val.handle_mut()); - changeevent.removed.set(removed_val.get()); - } - + changeevent.added.set(to_frozen_array(added, cx)); + changeevent.removed.set(to_frozen_array(removed, cx)); changeevent } } diff --git a/tests/wpt/meta/MANIFEST.json b/tests/wpt/meta/MANIFEST.json index 47b49c3fd01..098e27f4e4d 100644 --- a/tests/wpt/meta/MANIFEST.json +++ b/tests/wpt/meta/MANIFEST.json @@ -844130,7 +844130,7 @@ ] ], "events_input_sources_change.https.html": [ - "b2a17d4e17ae03bf7ed51e07095aa36dcce033a3", + "db8a8233fe55a920a077a644d711a455daf14b6b", [ null, {} diff --git a/tests/wpt/tests/webxr/events_input_sources_change.https.html b/tests/wpt/tests/webxr/events_input_sources_change.https.html index b2a17d4e17a..db8a8233fe5 100644 --- a/tests/wpt/tests/webxr/events_input_sources_change.https.html +++ b/tests/wpt/tests/webxr/events_input_sources_change.https.html @@ -5,6 +5,7 @@