diff options
Diffstat (limited to 'components/script/dom/xr.rs')
| -rw-r--r-- | components/script/dom/xr.rs | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/components/script/dom/xr.rs b/components/script/dom/xr.rs index 95fc5003c2a..cd963c4cf03 100644 --- a/components/script/dom/xr.rs +++ b/components/script/dom/xr.rs @@ -2,6 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ +use crate::compartments::{AlreadyInCompartment, InCompartment}; use crate::dom::bindings::cell::DomRefCell; use crate::dom::bindings::codegen::Bindings::VRDisplayBinding::VRDisplayMethods; use crate::dom::bindings::codegen::Bindings::XRBinding; @@ -83,10 +84,13 @@ impl Drop for XR { impl XRMethods for XR { /// https://immersive-web.github.io/webxr/#dom-xr-supportssessionmode - #[allow(unsafe_code)] fn SupportsSessionMode(&self, mode: XRSessionMode) -> Rc<Promise> { // XXXManishearth this should select an XR device first - let promise = unsafe { Promise::new_in_current_compartment(&self.global()) }; + let in_compartment_proof = AlreadyInCompartment::assert(&self.global()); + let promise = Promise::new_in_current_compartment( + &self.global(), + &InCompartment::Already(&in_compartment_proof), + ); if mode == XRSessionMode::Immersive_vr { promise.resolve_native(&()); } else { @@ -98,9 +102,12 @@ impl XRMethods for XR { } /// https://immersive-web.github.io/webxr/#dom-xr-requestsession - #[allow(unsafe_code)] fn RequestSession(&self, options: &XRSessionCreationOptions) -> Rc<Promise> { - let promise = unsafe { Promise::new_in_current_compartment(&self.global()) }; + let in_compartment_proof = AlreadyInCompartment::assert(&self.global()); + let promise = Promise::new_in_current_compartment( + &self.global(), + &InCompartment::Already(&in_compartment_proof), + ); if options.mode != XRSessionMode::Immersive_vr { promise.reject_error(Error::NotSupported); return promise; |