aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/permissions.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/permissions.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/permissions.rs')
-rw-r--r--components/script/dom/permissions.rs10
1 files changed, 8 insertions, 2 deletions
diff --git a/components/script/dom/permissions.rs b/components/script/dom/permissions.rs
index 6886532d1ab..e6eba6a5082 100644
--- a/components/script/dom/permissions.rs
+++ b/components/script/dom/permissions.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::PermissionStatusBinding::PermissionDescriptor;
use crate::dom::bindings::codegen::Bindings::PermissionStatusBinding::PermissionStatusMethods;
use crate::dom::bindings::codegen::Bindings::PermissionStatusBinding::{
@@ -87,7 +88,6 @@ impl Permissions {
// https://w3c.github.io/permissions/#dom-permissions-query
// https://w3c.github.io/permissions/#dom-permissions-request
// https://w3c.github.io/permissions/#dom-permissions-revoke
- #[allow(unsafe_code)]
fn manipulate(
&self,
op: Operation,
@@ -98,7 +98,13 @@ impl Permissions {
// (Query, Request) Step 3.
let p = match promise {
Some(promise) => promise,
- None => unsafe { Promise::new_in_current_compartment(&self.global()) },
+ None => {
+ let in_compartment_proof = AlreadyInCompartment::assert(&self.global());
+ Promise::new_in_current_compartment(
+ &self.global(),
+ &InCompartment::Already(&in_compartment_proof),
+ )
+ },
};
// (Query, Request, Revoke) Step 1.