Support arbitrary protos when wrapping DOM objects with constructors.

1 files changed, 17 insertions, 3 deletions

diff --git a/components/script/dom/submitevent.rs b/components/script/dom/submitevent.rs
index c9965b762b1..cf62813a4dc 100644
--- a/components/script/dom/submitevent.rs
+++ b/components/script/dom/submitevent.rs
@@ -6,7 +6,7 @@ use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
 use crate::dom::bindings::codegen::Bindings::SubmitEventBinding;
 use crate::dom::bindings::codegen::Bindings::SubmitEventBinding::SubmitEventMethods;
 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::DomRoot;
 use crate::dom::bindings::str::DOMString;
 use crate::dom::event::Event;
@@ -14,6 +14,7 @@ use crate::dom::globalscope::GlobalScope;
 use crate::dom::htmlelement::HTMLElement;
 use crate::dom::window::Window;
 use dom_struct::dom_struct;
+use js::rust::HandleObject;
 use servo_atoms::Atom;
 
 #[dom_struct]
@@ -38,7 +39,18 @@ impl SubmitEvent {
         cancelable: bool,
         submitter: Option<DomRoot<HTMLElement>>,
     ) -> DomRoot<SubmitEvent> {
-        let ev = reflect_dom_object(Box::new(SubmitEvent::new_inherited(submitter)), global);
+        Self::new_with_proto(global, None, type_, bubbles, cancelable, submitter)
+    }
+
+    fn new_with_proto(
+        global: &GlobalScope,
+        proto: Option<HandleObject>,
+        type_: Atom,
+        bubbles: bool,
+        cancelable: bool,
+        submitter: Option<DomRoot<HTMLElement>>,
+    ) -> DomRoot<SubmitEvent> {
+        let ev = reflect_dom_object2(Box::new(SubmitEvent::new_inherited(submitter)), global, proto);
         {
             let event = ev.upcast::<Event>();
             event.init_event(type_, bubbles, cancelable);
@@ -49,11 +61,13 @@ impl SubmitEvent {
     #[allow(non_snake_case)]
     pub fn Constructor(
         window: &Window,
+        proto: Option<HandleObject>,
         type_: DOMString,
         init: &SubmitEventBinding::SubmitEventInit,
     ) -> DomRoot<SubmitEvent> {
-        SubmitEvent::new(
+        SubmitEvent::new_with_proto(
             &window.global(),
+            proto,
             Atom::from(type_),
             init.parent.bubbles,
             init.parent.cancelable,