From 1b6949d4cf951600efa6db6747b65e2db42a96cd Mon Sep 17 00:00:00 2001 From: Aron Zwaan Date: Wed, 24 Apr 2019 18:53:50 +0200 Subject: Add proof parameter to Promise::new_in_current_compartment --- components/script/dom/permissions.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'components/script/dom/permissions.rs') 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. -- cgit v1.2.3 From e2e6e2ac9428b9448edb06f7f11b201ce68e7191 Mon Sep 17 00:00:00 2001 From: Aron Zwaan Date: Wed, 24 Apr 2019 22:33:16 +0200 Subject: Pass InCompartment by value --- components/script/dom/permissions.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/script/dom/permissions.rs') diff --git a/components/script/dom/permissions.rs b/components/script/dom/permissions.rs index e6eba6a5082..e7d3b600814 100644 --- a/components/script/dom/permissions.rs +++ b/components/script/dom/permissions.rs @@ -102,7 +102,7 @@ impl Permissions { let in_compartment_proof = AlreadyInCompartment::assert(&self.global()); Promise::new_in_current_compartment( &self.global(), - &InCompartment::Already(&in_compartment_proof), + InCompartment::Already(&in_compartment_proof), ) }, }; -- cgit v1.2.3