diff options
author | Aron Zwaan <aronzwaan@gmail.com> | 2019-04-24 18:53:50 +0200 |
---|---|---|
committer | Aron Zwaan <aronzwaan@gmail.com> | 2019-04-24 19:46:10 +0200 |
commit | 1b6949d4cf951600efa6db6747b65e2db42a96cd (patch) | |
tree | c6270640b2f73045f91c1b65723e865490e69656 /components/script/dom/document.rs | |
parent | 7b293ee8cba64937c591c36a9a7e1d6c727d247c (diff) | |
download | servo-1b6949d4cf951600efa6db6747b65e2db42a96cd.tar.gz servo-1b6949d4cf951600efa6db6747b65e2db42a96cd.zip |
Add proof parameter to Promise::new_in_current_compartment
Diffstat (limited to 'components/script/dom/document.rs')
-rw-r--r-- | components/script/dom/document.rs | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index ed011c8029d..7d4950caa66 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.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::document_loader::{DocumentLoader, LoadType}; use crate::dom::activation::{synthetic_click_activation, ActivationSource}; use crate::dom::attr::Attr; @@ -3129,10 +3130,13 @@ impl Document { } // https://fullscreen.spec.whatwg.org/#dom-element-requestfullscreen - #[allow(unsafe_code)] pub fn enter_fullscreen(&self, pending: &Element) -> Rc<Promise> { // Step 1 - 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), + ); let mut error = false; // Step 4 @@ -3196,11 +3200,14 @@ impl Document { } // https://fullscreen.spec.whatwg.org/#exit-fullscreen - #[allow(unsafe_code)] pub fn exit_fullscreen(&self) -> Rc<Promise> { let global = self.global(); // Step 1 - let promise = unsafe { Promise::new_in_current_compartment(&global) }; + let in_compartment_proof = AlreadyInCompartment::assert(&global); + let promise = Promise::new_in_current_compartment( + &global, + &InCompartment::Already(&in_compartment_proof), + ); // Step 2 if self.fullscreen_element.get().is_none() { promise.reject_error(Error::Type(String::from("fullscreen is null"))); |