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/testbinding.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/testbinding.rs')
-rw-r--r-- | components/script/dom/testbinding.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/testbinding.rs b/components/script/dom/testbinding.rs index 52018d73b6f..c77b7cd994d 100644 --- a/components/script/dom/testbinding.rs +++ b/components/script/dom/testbinding.rs @@ -4,7 +4,6 @@ // check-tidy: no specs after this line -use crate::compartments::InCompartment; use crate::dom::bindings::callback::ExceptionHandling; use crate::dom::bindings::codegen::Bindings::EventListenerBinding::EventListener; use crate::dom::bindings::codegen::Bindings::FunctionBinding::Function; @@ -49,6 +48,7 @@ use crate::dom::globalscope::GlobalScope; use crate::dom::promise::Promise; use crate::dom::promisenativehandler::{Callback, PromiseNativeHandler}; use crate::dom::url::URL; +use crate::realms::InRealm; use crate::script_runtime::JSContext as SafeJSContext; use crate::timers::OneshotTimerCallback; use dom_struct::dom_struct; @@ -990,7 +990,7 @@ impl TestBindingMethods for TestBinding { &self, resolve: Option<Rc<SimpleCallback>>, reject: Option<Rc<SimpleCallback>>, - comp: InCompartment, + comp: InRealm, ) -> Rc<Promise> { let global = self.global(); let handler = PromiseNativeHandler::new( @@ -998,7 +998,7 @@ impl TestBindingMethods for TestBinding { resolve.map(SimpleHandler::new), reject.map(SimpleHandler::new), ); - let p = Promise::new_in_current_compartment(&global, comp); + let p = Promise::new_in_current_realm(&global, comp); p.append_native_handler(&handler); return p; @@ -1021,8 +1021,8 @@ impl TestBindingMethods for TestBinding { } } - fn PromiseAttribute(&self, comp: InCompartment) -> Rc<Promise> { - Promise::new_in_current_compartment(&self.global(), comp) + fn PromiseAttribute(&self, comp: InRealm) -> Rc<Promise> { + Promise::new_in_current_realm(&self.global(), comp) } fn AcceptPromise(&self, _promise: &Promise) {} |