diff options
Diffstat (limited to 'components/script/dom/navigationpreloadmanager.rs')
| -rw-r--r-- | components/script/dom/navigationpreloadmanager.rs | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/components/script/dom/navigationpreloadmanager.rs b/components/script/dom/navigationpreloadmanager.rs index d07be1b070e..a170acda4bc 100644 --- a/components/script/dom/navigationpreloadmanager.rs +++ b/components/script/dom/navigationpreloadmanager.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 http://mozilla.org/MPL/2.0/. */ +use crate::compartments::{AlreadyInCompartment, InCompartment}; use crate::dom::bindings::codegen::Bindings::NavigationPreloadManagerBinding::NavigationPreloadState; use crate::dom::bindings::codegen::Bindings::NavigationPreloadManagerBinding::{ NavigationPreloadManagerMethods, Wrap, @@ -43,9 +44,12 @@ impl NavigationPreloadManager { impl NavigationPreloadManagerMethods for NavigationPreloadManager { // https://w3c.github.io/ServiceWorker/#navigation-preload-manager-enable - #[allow(unsafe_code)] fn Enable(&self) -> 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), + ); // 2. if self.serviceworker_registration.active().is_none() { @@ -66,9 +70,12 @@ impl NavigationPreloadManagerMethods for NavigationPreloadManager { } // https://w3c.github.io/ServiceWorker/#navigation-preload-manager-disable - #[allow(unsafe_code)] fn Disable(&self) -> 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), + ); // 2. if self.serviceworker_registration.active().is_none() { @@ -89,9 +96,12 @@ impl NavigationPreloadManagerMethods for NavigationPreloadManager { } // https://w3c.github.io/ServiceWorker/#navigation-preload-manager-setheadervalue - #[allow(unsafe_code)] fn SetHeaderValue(&self, value: ByteString) -> 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), + ); // 2. if self.serviceworker_registration.active().is_none() { @@ -112,9 +122,12 @@ impl NavigationPreloadManagerMethods for NavigationPreloadManager { } // https://w3c.github.io/ServiceWorker/#navigation-preload-manager-getstate - #[allow(unsafe_code)] fn GetState(&self) -> 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), + ); // 2. let mut state = NavigationPreloadState::empty(); |