diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2020-01-24 17:10:21 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-24 17:10:21 -0500 |
commit | 12693b51f510761d5dd58a9103596a192edb803c (patch) | |
tree | 9e2e750f620ae592f35705f3b4cc959f22525628 /components/script/dom/promise.rs | |
parent | 60238afa6ce1aa9078908b5fefd5426f48a9911b (diff) | |
parent | 5a3e1b8e6903c825e50597a218532d417f1dfef9 (diff) | |
download | servo-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/promise.rs')
-rw-r--r-- | components/script/dom/promise.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/promise.rs b/components/script/dom/promise.rs index 785c1be8939..f3671a5057f 100644 --- a/components/script/dom/promise.rs +++ b/components/script/dom/promise.rs @@ -11,13 +11,13 @@ //! native Promise values that refer to the same JS value yet are distinct native objects //! (ie. address equality for the native objects is meaningless). -use crate::compartments::{enter_realm, InCompartment}; use crate::dom::bindings::conversions::root_from_object; use crate::dom::bindings::error::{Error, Fallible}; use crate::dom::bindings::reflector::{DomObject, MutDomObject, Reflector}; use crate::dom::bindings::utils::AsCCharPtrPtr; use crate::dom::globalscope::GlobalScope; use crate::dom::promisenativehandler::PromiseNativeHandler; +use crate::realms::{enter_realm, InRealm}; use crate::script_runtime::JSContext as SafeJSContext; use dom_struct::dom_struct; use js::conversions::ToJSValConvertible; @@ -83,12 +83,12 @@ impl Drop for Promise { impl Promise { pub fn new(global: &GlobalScope) -> Rc<Promise> { - let compartment = enter_realm(&*global); - let comp = InCompartment::Entered(&compartment); - Promise::new_in_current_compartment(global, comp) + let realm = enter_realm(&*global); + let comp = InRealm::Entered(&realm); + Promise::new_in_current_realm(global, comp) } - pub fn new_in_current_compartment(global: &GlobalScope, _comp: InCompartment) -> Rc<Promise> { + pub fn new_in_current_realm(global: &GlobalScope, _comp: InRealm) -> Rc<Promise> { let cx = global.get_cx(); rooted!(in(*cx) let mut obj = ptr::null_mut::<JSObject>()); Promise::create_js_promise(cx, HandleObject::null(), obj.handle_mut()); |