aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/xr.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2020-01-24 17:10:21 -0500
committerGitHub <noreply@github.com>2020-01-24 17:10:21 -0500
commit12693b51f510761d5dd58a9103596a192edb803c (patch)
tree9e2e750f620ae592f35705f3b4cc959f22525628 /components/script/dom/xr.rs
parent60238afa6ce1aa9078908b5fefd5426f48a9911b (diff)
parent5a3e1b8e6903c825e50597a218532d417f1dfef9 (diff)
downloadservo-12693b51f510761d5dd58a9103596a192edb803c.tar.gz
servo-12693b51f510761d5dd58a9103596a192edb803c.zip
Auto merge of #25597 - kunalmohan:25581-Compartment, r=jdm
Rename compartment to realm <!-- Please describe your changes on the following line: --> Rename compartment-related terminology to use realms instead. r?@jdm --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #25581 (GitHub issue number if applicable) <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'components/script/dom/xr.rs')
-rw-r--r--components/script/dom/xr.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/xr.rs b/components/script/dom/xr.rs
index 46bcc46b090..00f86203b26 100644
--- a/components/script/dom/xr.rs
+++ b/components/script/dom/xr.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::InCompartment;
use crate::dom::bindings::cell::DomRefCell;
use crate::dom::bindings::codegen::Bindings::VRDisplayBinding::VRDisplayMethods;
use crate::dom::bindings::codegen::Bindings::XRBinding;
@@ -25,6 +24,7 @@ use crate::dom::vrdisplay::VRDisplay;
use crate::dom::vrdisplayevent::VRDisplayEvent;
use crate::dom::xrsession::XRSession;
use crate::dom::xrtest::XRTest;
+use crate::realms::InRealm;
use crate::script_thread::ScriptThread;
use crate::task_source::TaskSource;
use dom_struct::dom_struct;
@@ -161,11 +161,11 @@ impl XRMethods for XR {
&self,
mode: XRSessionMode,
init: RootedTraceableBox<XRSessionInit>,
- comp: InCompartment,
+ comp: InRealm,
) -> Rc<Promise> {
let global = self.global();
let window = global.as_window();
- let promise = Promise::new_in_current_compartment(&global, comp);
+ let promise = Promise::new_in_current_realm(&global, comp);
if mode != XRSessionMode::Inline {
if !ScriptThread::is_user_interacting() {