From 5a3e1b8e6903c825e50597a218532d417f1dfef9 Mon Sep 17 00:00:00 2001 From: Kunal Mohan Date: Fri, 24 Jan 2020 13:29:09 +0530 Subject: rename compartment to realm --- components/script/dom/document.rs | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'components/script/dom/document.rs') diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 16f22c1dfa8..98e7663bbf1 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -2,7 +2,6 @@ * 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; @@ -97,6 +96,7 @@ use crate::dom::wheelevent::WheelEvent; use crate::dom::window::{ReflowReason, Window}; use crate::dom::windowproxy::WindowProxy; use crate::fetch::FetchCanceller; +use crate::realms::{AlreadyInRealm, InRealm}; use crate::script_runtime::JSContext; use crate::script_runtime::{CommonScriptMsg, ScriptThreadEventCategory}; use crate::script_thread::{MainThreadScriptMsg, ScriptThread}; @@ -3170,11 +3170,9 @@ impl Document { // https://fullscreen.spec.whatwg.org/#dom-element-requestfullscreen pub fn enter_fullscreen(&self, pending: &Element) -> Rc { // Step 1 - let in_compartment_proof = AlreadyInCompartment::assert(&self.global()); - let promise = Promise::new_in_current_compartment( - &self.global(), - InCompartment::Already(&in_compartment_proof), - ); + let in_realm_proof = AlreadyInRealm::assert(&self.global()); + let promise = + Promise::new_in_current_realm(&self.global(), InRealm::Already(&in_realm_proof)); let mut error = false; // Step 4 @@ -3241,11 +3239,8 @@ impl Document { pub fn exit_fullscreen(&self) -> Rc { let global = self.global(); // Step 1 - let in_compartment_proof = AlreadyInCompartment::assert(&global); - let promise = Promise::new_in_current_compartment( - &global, - InCompartment::Already(&in_compartment_proof), - ); + let in_realm_proof = AlreadyInRealm::assert(&global); + let promise = Promise::new_in_current_realm(&global, InRealm::Already(&in_realm_proof)); // Step 2 if self.fullscreen_element.get().is_none() { promise.reject_error(Error::Type(String::from("fullscreen is null"))); -- cgit v1.2.3