diff options
author | Manish Goregaokar <manishsmail@gmail.com> | 2019-04-03 11:30:18 -0700 |
---|---|---|
committer | Manish Goregaokar <manishsmail@gmail.com> | 2019-04-03 23:55:33 -0700 |
commit | fcec93ae162798274576ff3b4d3c7310dd9fb3e3 (patch) | |
tree | 0aa9f19a4c3da06595e20ba0eb041fa1c11a99b7 /components/script/dom/xrrigidtransform.rs | |
parent | f7745edcbb1d980d32834af3b059310b41635a2b (diff) | |
download | servo-fcec93ae162798274576ff3b4d3c7310dd9fb3e3.tar.gz servo-fcec93ae162798274576ff3b4d3c7310dd9fb3e3.zip |
Consistently use GlobalScope in XR code
Diffstat (limited to 'components/script/dom/xrrigidtransform.rs')
-rw-r--r-- | components/script/dom/xrrigidtransform.rs | 13 |
1 files changed, 8 insertions, 5 deletions
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<f64>) -> DomRoot<XRRigidTransform> { + pub fn new( + global: &GlobalScope, + transform: RigidTransform3D<f64>, + ) -> DomRoot<XRRigidTransform> { reflect_dom_object( Box::new(XRRigidTransform::new_inherited(transform)), global, @@ -42,7 +46,7 @@ impl XRRigidTransform { ) } - pub fn identity(window: &Window) -> DomRoot<XRRigidTransform> { + pub fn identity(window: &GlobalScope) -> DomRoot<XRRigidTransform> { 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<XRRigidTransform> { - let global = self.global(); - XRRigidTransform::new(global.as_window(), self.transform.inverse()) + XRRigidTransform::new(&self.global(), self.transform.inverse()) } } |