From fcec93ae162798274576ff3b4d3c7310dd9fb3e3 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Wed, 3 Apr 2019 11:30:18 -0700 Subject: [PATCH] Consistently use GlobalScope in XR code --- components/script/dom/xrpose.rs | 2 +- components/script/dom/xrreferencespace.rs | 4 ++-- components/script/dom/xrrigidtransform.rs | 13 ++++++++----- components/script/dom/xrsession.rs | 7 ++----- components/script/dom/xrstationaryreferencespace.rs | 8 ++++---- components/script/dom/xrviewerpose.rs | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/components/script/dom/xrpose.rs b/components/script/dom/xrpose.rs index 16f3a725bc9..9f8aec3a366 100644 --- a/components/script/dom/xrpose.rs +++ b/components/script/dom/xrpose.rs @@ -27,7 +27,7 @@ impl XRPose { #[allow(unused)] pub fn new(global: &GlobalScope, transform: RigidTransform3D) -> DomRoot { - let transform = XRRigidTransform::new(&global.as_window(), transform); + let transform = XRRigidTransform::new(global, transform); reflect_dom_object( Box::new(XRPose::new_inherited(&transform)), global, diff --git a/components/script/dom/xrreferencespace.rs b/components/script/dom/xrreferencespace.rs index 9130c5ae21f..ed42d63b4be 100644 --- a/components/script/dom/xrreferencespace.rs +++ b/components/script/dom/xrreferencespace.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::XRReferenceSpaceBinding::XRReferenc use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::reflector::reflect_dom_object; use crate::dom::bindings::root::{DomRoot, MutDom}; -use crate::dom::window::Window; +use crate::dom::globalscope::GlobalScope; use crate::dom::xrrigidtransform::XRRigidTransform; use crate::dom::xrsession::XRSession; use crate::dom::xrspace::XRSpace; @@ -31,7 +31,7 @@ impl XRReferenceSpace { } #[allow(unused)] - pub fn identity(global: &Window, session: &XRSession) -> DomRoot { + pub fn identity(global: &GlobalScope, session: &XRSession) -> DomRoot { let transform = XRRigidTransform::identity(global); reflect_dom_object( Box::new(XRReferenceSpace::new_inherited(session, &transform)), diff --git a/components/script/dom/xrrigidtransform.rs b/components/script/dom/xrrigidtransform.rs index c89ffaa3d39..be27d20d6ee 100644 --- a/components/script/dom/xrrigidtransform.rs +++ b/components/script/dom/xrrigidtransform.rs @@ -11,6 +11,7 @@ use crate::dom::bindings::reflector::DomObject; use crate::dom::bindings::reflector::{reflect_dom_object, Reflector}; use crate::dom::bindings::root::{DomRoot, MutNullableDom}; use crate::dom::dompointreadonly::DOMPointReadOnly; +use crate::dom::globalscope::GlobalScope; use crate::dom::window::Window; use dom_struct::dom_struct; use euclid::{RigidTransform3D, Rotation3D, Vector3D}; @@ -34,7 +35,10 @@ impl XRRigidTransform { } } - pub fn new(global: &Window, transform: RigidTransform3D) -> DomRoot { + pub fn new( + global: &GlobalScope, + transform: RigidTransform3D, + ) -> DomRoot { reflect_dom_object( Box::new(XRRigidTransform::new_inherited(transform)), global, @@ -42,7 +46,7 @@ impl XRRigidTransform { ) } - pub fn identity(window: &Window) -> DomRoot { + pub fn identity(window: &GlobalScope) -> DomRoot { let transform = RigidTransform3D::identity(); XRRigidTransform::new(window, transform) } @@ -68,7 +72,7 @@ impl XRRigidTransform { orientation.w as f64, ); let transform = RigidTransform3D::new(rotate, translate); - Ok(XRRigidTransform::new(window, transform)) + Ok(XRRigidTransform::new(&window.global(), transform)) } } @@ -89,8 +93,7 @@ impl XRRigidTransformMethods for XRRigidTransform { } // https://immersive-web.github.io/webxr/#dom-xrrigidtransform-inverse fn Inverse(&self) -> DomRoot { - let global = self.global(); - XRRigidTransform::new(global.as_window(), self.transform.inverse()) + XRRigidTransform::new(&self.global(), self.transform.inverse()) } } diff --git a/components/script/dom/xrsession.rs b/components/script/dom/xrsession.rs index 8c96ab66094..bf7dcb92258 100644 --- a/components/script/dom/xrsession.rs +++ b/components/script/dom/xrsession.rs @@ -115,15 +115,12 @@ impl XRSessionMethods for XRSession { match options.type_ { XRReferenceSpaceType::Identity => { - p.resolve_native(&XRReferenceSpace::identity( - &self.global().as_window(), - self, - )); + p.resolve_native(&XRReferenceSpace::identity(&self.global(), self)); }, XRReferenceSpaceType::Stationary => { if let Some(subtype) = options.subtype { p.resolve_native(&XRStationaryReferenceSpace::new( - &self.global().as_window(), + &self.global(), self, subtype, )); diff --git a/components/script/dom/xrstationaryreferencespace.rs b/components/script/dom/xrstationaryreferencespace.rs index 58c4b4c8f16..ddba9aaa20b 100644 --- a/components/script/dom/xrstationaryreferencespace.rs +++ b/components/script/dom/xrstationaryreferencespace.rs @@ -6,7 +6,7 @@ use crate::dom::bindings::codegen::Bindings::XRStationaryReferenceSpaceBinding; use crate::dom::bindings::codegen::Bindings::XRStationaryReferenceSpaceBinding::XRStationaryReferenceSpaceSubtype; use crate::dom::bindings::reflector::reflect_dom_object; use crate::dom::bindings::root::DomRoot; -use crate::dom::window::Window; +use crate::dom::globalscope::GlobalScope; use crate::dom::xrreferencespace::XRReferenceSpace; use crate::dom::xrrigidtransform::XRRigidTransform; use crate::dom::xrsession::XRSession; @@ -34,16 +34,16 @@ impl XRStationaryReferenceSpace { } pub fn new( - window: &Window, + global: &GlobalScope, session: &XRSession, ty: XRStationaryReferenceSpaceSubtype, ) -> DomRoot { - let transform = XRRigidTransform::identity(window); + let transform = XRRigidTransform::identity(global); reflect_dom_object( Box::new(XRStationaryReferenceSpace::new_inherited( session, ty, &transform, )), - window, + global, XRStationaryReferenceSpaceBinding::Wrap, ) } diff --git a/components/script/dom/xrviewerpose.rs b/components/script/dom/xrviewerpose.rs index f04fa6285bd..717fdcea16e 100644 --- a/components/script/dom/xrviewerpose.rs +++ b/components/script/dom/xrviewerpose.rs @@ -42,7 +42,7 @@ impl XRViewerPose { ) -> DomRoot { let left = XRView::new(global, session, XREye::Left, &pose, &data); let right = XRView::new(global, session, XREye::Right, &pose, &data); - let transform = XRRigidTransform::new(&global.as_window(), pose); + let transform = XRRigidTransform::new(global, pose); let pose = reflect_dom_object( Box::new(XRViewerPose::new_inherited(&transform)), global,