Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use the newly added inCompartments option everywhere it can be

Browse source
This commit is contained in:
Bastien Orivel 2019-05-25 17:00:10 +02:00
parent 0b29caa554
commit 292d468cd1
22 changed files with 216 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

34
components/script/dom/navigationpreloadmanager.rs
View file

@ -2,7 +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::compartments::InCompartment;
use crate::dom::bindings::codegen::Bindings::NavigationPreloadManagerBinding::NavigationPreloadState;
use crate::dom::bindings::codegen::Bindings::NavigationPreloadManagerBinding::{
NavigationPreloadManagerMethods, Wrap,
@ -44,12 +44,8 @@ impl NavigationPreloadManager {
impl NavigationPreloadManagerMethods for NavigationPreloadManager {
// https://w3c.github.io/ServiceWorker/#navigation-preload-manager-enable
fn Enable(&self) -> Rc<Promise> {
let in_compartment_proof = AlreadyInCompartment::assert(&*self.global());
let promise = Promise::new_in_current_compartment(
&*self.global(),
InCompartment::Already(&in_compartment_proof),
);
fn Enable(&self, comp: InCompartment) -> Rc<Promise> {
let promise = Promise::new_in_current_compartment(&*self.global(), comp);
// 2.
if self.serviceworker_registration.active().is_none() {
@ -70,12 +66,8 @@ impl NavigationPreloadManagerMethods for NavigationPreloadManager {
}
// https://w3c.github.io/ServiceWorker/#navigation-preload-manager-disable
fn Disable(&self) -> Rc<Promise> {
let in_compartment_proof = AlreadyInCompartment::assert(&*self.global());
let promise = Promise::new_in_current_compartment(
&*self.global(),
InCompartment::Already(&in_compartment_proof),
);
fn Disable(&self, comp: InCompartment) -> Rc<Promise> {
let promise = Promise::new_in_current_compartment(&*self.global(), comp);
// 2.
if self.serviceworker_registration.active().is_none() {
@ -96,12 +88,8 @@ impl NavigationPreloadManagerMethods for NavigationPreloadManager {
}
// https://w3c.github.io/ServiceWorker/#navigation-preload-manager-setheadervalue
fn SetHeaderValue(&self, value: ByteString) -> Rc<Promise> {
let in_compartment_proof = AlreadyInCompartment::assert(&*self.global());
let promise = Promise::new_in_current_compartment(
&*self.global(),
InCompartment::Already(&in_compartment_proof),
);
fn SetHeaderValue(&self, value: ByteString, comp: InCompartment) -> Rc<Promise> {
let promise = Promise::new_in_current_compartment(&*self.global(), comp);
// 2.
if self.serviceworker_registration.active().is_none() {
@ -122,12 +110,8 @@ impl NavigationPreloadManagerMethods for NavigationPreloadManager {
}
// https://w3c.github.io/ServiceWorker/#navigation-preload-manager-getstate
fn GetState(&self) -> Rc<Promise> {
let in_compartment_proof = AlreadyInCompartment::assert(&*self.global());
let promise = Promise::new_in_current_compartment(
&*self.global(),
InCompartment::Already(&in_compartment_proof),
);
fn GetState(&self, comp: InCompartment) -> Rc<Promise> {
let promise = Promise::new_in_current_compartment(&*self.global(), comp);
// 2.
let mut state = NavigationPreloadState::empty();