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/xrrigidtransform.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'components/script/dom/xrrigidtransform.rs') diff --git a/components/script/dom/xrrigidtransform.rs b/components/script/dom/xrrigidtransform.rs index 00909e1fe1c..4cbbee32386 100644 --- a/components/script/dom/xrrigidtransform.rs +++ b/components/script/dom/xrrigidtransform.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::XRRigidTransformBinding::XRRigidTra use crate::dom::bindings::error::Error; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::reflector::DomObject; -use crate::dom::bindings::reflector::{reflect_dom_object, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object2, Reflector}; use crate::dom::bindings::root::{DomRoot, MutNullableDom}; use crate::dom::bindings::utils::create_typed_array; use crate::dom::dompointreadonly::DOMPointReadOnly; @@ -18,6 +18,7 @@ use crate::script_runtime::JSContext; use dom_struct::dom_struct; use euclid::{RigidTransform3D, Rotation3D, Vector3D}; use js::jsapi::{Heap, JSObject}; +use js::rust::HandleObject; use std::ptr::NonNull; #[dom_struct] @@ -45,7 +46,11 @@ impl XRRigidTransform { } pub fn new(global: &GlobalScope, transform: ApiRigidTransform) -> DomRoot { - reflect_dom_object(Box::new(XRRigidTransform::new_inherited(transform)), global) + Self::new_with_proto(global, None, transform) + } + + fn new_with_proto(global: &GlobalScope, proto: Option, transform: ApiRigidTransform) -> DomRoot { + reflect_dom_object2(Box::new(XRRigidTransform::new_inherited(transform)), global, proto) } pub fn identity(window: &GlobalScope) -> DomRoot { @@ -57,6 +62,7 @@ impl XRRigidTransform { #[allow(non_snake_case)] pub fn Constructor( window: &Window, + proto: Option, position: &DOMPointInit, orientation: &DOMPointInit, ) -> Fallible> { @@ -81,7 +87,7 @@ impl XRRigidTransform { return Err(Error::InvalidState); } let transform = RigidTransform3D::new(rotate, translate); - Ok(XRRigidTransform::new(&window.global(), transform)) + Ok(XRRigidTransform::new_with_proto(&window.global(), proto, transform)) } } -- cgit v1.2.3