aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/bindings/callback.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/bindings/callback.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/bindings/callback.rs')
-rw-r--r--components/script/dom/bindings/callback.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/bindings/callback.rs b/components/script/dom/bindings/callback.rs
index fe6b8d36d39..6a69fb78209 100644
--- a/components/script/dom/bindings/callback.rs
+++ b/components/script/dom/bindings/callback.rs
@@ -205,7 +205,7 @@ impl CallbackInterface {
}
}
-/// Wraps the reflector for `p` into the compartment of `cx`.
+/// Wraps the reflector for `p` into the realm of `cx`.
pub fn wrap_call_this_object<T: DomObject>(cx: JSContext, p: &T, mut rval: MutableHandleObject) {
rval.set(p.reflector().get_jsobject().get());
assert!(!rval.get().is_null());
@@ -225,7 +225,7 @@ pub struct CallSetup {
exception_global: DomRoot<GlobalScope>,
/// The `JSContext` used for the call.
cx: JSContext,
- /// The compartment we were in before the call.
+ /// The realm we were in before the call.
old_realm: *mut Realm,
/// The exception handling used for the call.
handling: ExceptionHandling,