aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/xrsession.rs
diff options
context:
space:
mode:
authorAron Zwaan <aronzwaan@gmail.com>2019-04-24 18:53:50 +0200
committerAron Zwaan <aronzwaan@gmail.com>2019-04-24 19:46:10 +0200
commit1b6949d4cf951600efa6db6747b65e2db42a96cd (patch)
treec6270640b2f73045f91c1b65723e865490e69656 /components/script/dom/xrsession.rs
parent7b293ee8cba64937c591c36a9a7e1d6c727d247c (diff)
downloadservo-1b6949d4cf951600efa6db6747b65e2db42a96cd.tar.gz
servo-1b6949d4cf951600efa6db6747b65e2db42a96cd.zip
Add proof parameter to Promise::new_in_current_compartment
Diffstat (limited to 'components/script/dom/xrsession.rs')
-rw-r--r--components/script/dom/xrsession.rs15
1 files changed, 11 insertions, 4 deletions
diff --git a/components/script/dom/xrsession.rs b/components/script/dom/xrsession.rs
index 3b126ce445a..7633775ebc6 100644
--- a/components/script/dom/xrsession.rs
+++ b/components/script/dom/xrsession.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::codegen::Bindings::VRDisplayBinding::VRDisplayMethods;
use crate::dom::bindings::codegen::Bindings::XRBinding::XRSessionMode;
use crate::dom::bindings::codegen::Bindings::XRRenderStateBinding::XRRenderStateInit;
@@ -89,9 +90,12 @@ impl XRSessionMethods for XRSession {
}
/// https://immersive-web.github.io/webxr/#dom-xrsession-requestanimationframe
- #[allow(unsafe_code)]
fn UpdateRenderState(&self, init: &XRRenderStateInit) -> Rc<Promise> {
- let p = unsafe { Promise::new_in_current_compartment(&self.global()) };
+ let in_compartment_proof = AlreadyInCompartment::assert(&self.global());
+ let p = Promise::new_in_current_compartment(
+ &self.global(),
+ &InCompartment::Already(&in_compartment_proof),
+ );
self.display.queue_renderstate(init, p.clone());
p
}
@@ -112,9 +116,12 @@ impl XRSessionMethods for XRSession {
}
/// https://immersive-web.github.io/webxr/#dom-xrsession-requestreferencespace
- #[allow(unsafe_code)]
fn RequestReferenceSpace(&self, options: &XRReferenceSpaceOptions) -> Rc<Promise> {
- let p = unsafe { Promise::new_in_current_compartment(&self.global()) };
+ let in_compartment_proof = AlreadyInCompartment::assert(&self.global());
+ let p = Promise::new_in_current_compartment(
+ &self.global(),
+ &InCompartment::Already(&in_compartment_proof),
+ );
// https://immersive-web.github.io/webxr/#create-a-reference-space