Support arbitrary protos when wrapping DOM objects with constructors.

1 files changed, 36 insertions, 5 deletions

diff --git a/components/script/dom/wheelevent.rs b/components/script/dom/wheelevent.rs
index d7e33b84633..cc7847b1dcd 100644
--- a/components/script/dom/wheelevent.rs
+++ b/components/script/dom/wheelevent.rs
@@ -8,13 +8,14 @@ use crate::dom::bindings::codegen::Bindings::WheelEventBinding::WheelEventMethod
 use crate::dom::bindings::error::Fallible;
 use crate::dom::bindings::inheritance::Castable;
 use crate::dom::bindings::num::Finite;
-use crate::dom::bindings::reflector::reflect_dom_object;
+use crate::dom::bindings::reflector::reflect_dom_object2;
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::bindings::str::DOMString;
 use crate::dom::event::{Event, EventBubbles, EventCancelable};
 use crate::dom::mouseevent::MouseEvent;
 use crate::dom::window::Window;
 use dom_struct::dom_struct;
+use js::rust::HandleObject;
 use std::cell::Cell;
 
 #[dom_struct]
@@ -37,8 +38,8 @@ impl WheelEvent {
         }
     }
 
-    pub fn new_unintialized(window: &Window) -> DomRoot<WheelEvent> {
-        reflect_dom_object(Box::new(WheelEvent::new_inherited()), window)
+    fn new_unintialized(window: &Window, proto: Option<HandleObject>) -> DomRoot<WheelEvent> {
+        reflect_dom_object2(Box::new(WheelEvent::new_inherited()), window, proto)
     }
 
     pub fn new(
@@ -53,7 +54,35 @@ impl WheelEvent {
         delta_z: Finite<f64>,
         delta_mode: u32,
     ) -> DomRoot<WheelEvent> {
-        let ev = WheelEvent::new_unintialized(window);
+        Self::new_with_proto(
+            window,
+            None,
+            type_,
+            can_bubble,
+            cancelable,
+            view,
+            detail,
+            delta_x,
+            delta_y,
+            delta_z,
+            delta_mode,
+        )
+    }
+
+    fn new_with_proto(
+        window: &Window,
+        proto: Option<HandleObject>,
+        type_: DOMString,
+        can_bubble: EventBubbles,
+        cancelable: EventCancelable,
+        view: Option<&Window>,
+        detail: i32,
+        delta_x: Finite<f64>,
+        delta_y: Finite<f64>,
+        delta_z: Finite<f64>,
+        delta_mode: u32,
+    ) -> DomRoot<WheelEvent> {
+        let ev = WheelEvent::new_unintialized(window, proto);
         ev.InitWheelEvent(
             type_,
             bool::from(can_bubble),
@@ -72,11 +101,13 @@ impl WheelEvent {
     #[allow(non_snake_case)]
     pub fn Constructor(
         window: &Window,
+        proto: Option<HandleObject>,
         type_: DOMString,
         init: &WheelEventBinding::WheelEventInit,
     ) -> Fallible<DomRoot<WheelEvent>> {
-        let event = WheelEvent::new(
+        let event = WheelEvent::new_with_proto(
             window,
+            proto,
             type_,
             EventBubbles::from(init.parent.parent.parent.parent.bubbles),
             EventCancelable::from(init.parent.parent.parent.parent.cancelable),