From dbff26bce05d404027ef5bbfd85fb5995e4726bc Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Sun, 28 May 2023 22:43:55 -0400 Subject: Support arbitrary protos when wrapping DOM objects with constructors. --- components/script/dom/trackevent.rs | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'components/script/dom/trackevent.rs') diff --git a/components/script/dom/trackevent.rs b/components/script/dom/trackevent.rs index 34148f26527..7959574938e 100644 --- a/components/script/dom/trackevent.rs +++ b/components/script/dom/trackevent.rs @@ -9,7 +9,7 @@ use crate::dom::bindings::codegen::Bindings::TrackEventBinding::TrackEventMethod use crate::dom::bindings::codegen::UnionTypes::VideoTrackOrAudioTrackOrTextTrack; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::{reflect_dom_object, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; use crate::dom::event::Event; @@ -18,6 +18,7 @@ use crate::dom::texttrack::TextTrack; use crate::dom::videotrack::VideoTrack; use crate::dom::window::Window; use dom_struct::dom_struct; +use js::rust::HandleObject; use servo_atoms::Atom; #[unrooted_must_root_lint::must_root] @@ -64,7 +65,18 @@ impl TrackEvent { cancelable: bool, track: &Option, ) -> DomRoot { - let te = reflect_dom_object(Box::new(TrackEvent::new_inherited(&track)), global); + Self::new_with_proto(global, None, type_, bubbles, cancelable, track) + } + + fn new_with_proto( + global: &GlobalScope, + proto: Option, + type_: Atom, + bubbles: bool, + cancelable: bool, + track: &Option, + ) -> DomRoot { + let te = reflect_dom_object2(Box::new(TrackEvent::new_inherited(&track)), global, proto); { let event = te.upcast::(); event.init_event(type_, bubbles, cancelable); @@ -74,11 +86,13 @@ impl TrackEvent { pub fn Constructor( window: &Window, + proto: Option, type_: DOMString, init: &TrackEventBinding::TrackEventInit, ) -> Fallible> { - Ok(TrackEvent::new( + Ok(TrackEvent::new_with_proto( &window.global(), + proto, Atom::from(type_), init.parent.bubbles, init.parent.cancelable, -- cgit v1.2.3