aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/xr.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-04-06 03:33:08 -0400
committerGitHub <noreply@github.com>2019-04-06 03:33:08 -0400
commitbe1e0690eb890ef785cee76e3a180f9265d820b8 (patch)
tree3448838c31cd6873b3a2383a1586e0c205aa9743 /components/script/dom/xr.rs
parent967efc7fbc0fdfe55eeb9c1f6ac9f3df933f72d9 (diff)
parent60ba3d25730815817abe60f5fdbed1fa4ff2a553 (diff)
downloadservo-be1e0690eb890ef785cee76e3a180f9265d820b8.tar.gz
servo-be1e0690eb890ef785cee76e3a180f9265d820b8.zip
Auto merge of #23158 - BartGitHub:promise-constructor, r=jdm
Promise constructor In this PR, measures are taken that prevent the ```Promise::new``` constructor from being used outside a compartment. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #22982 (GitHub issue number if applicable) <!-- Either: --> - [x] These changes do not require tests because no new functionality is added. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23158) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/xr.rs')
-rw-r--r--components/script/dom/xr.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/components/script/dom/xr.rs b/components/script/dom/xr.rs
index 13838ac2b20..95fc5003c2a 100644
--- a/components/script/dom/xr.rs
+++ b/components/script/dom/xr.rs
@@ -83,9 +83,10 @@ 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 = Promise::new(&self.global());
+ let promise = unsafe { Promise::new_in_current_compartment(&self.global()) };
if mode == XRSessionMode::Immersive_vr {
promise.resolve_native(&());
} else {
@@ -97,8 +98,9 @@ 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 = Promise::new(&self.global());
+ let promise = unsafe { Promise::new_in_current_compartment(&self.global()) };
if options.mode != XRSessionMode::Immersive_vr {
promise.reject_error(Error::NotSupported);
return promise;