diff options
| author | Anthony Ramine <n.oxyde@gmail.com> | 2016-10-05 11:06:25 +0200 |
|---|---|---|
| committer | Anthony Ramine <n.oxyde@gmail.com> | 2016-10-06 21:36:41 +0200 |
| commit | d8e92bb271a9f9dd87bf77e38cd820d01f2f0ae4 (patch) | |
| tree | 14676fcd23d30d1652023aa14969446f58b83922 /components/script/dom/promise.rs | |
| parent | b6bbd41e11a8d73f884b7011905c05bd3efec3cd (diff) | |
| download | servo-d8e92bb271a9f9dd87bf77e38cd820d01f2f0ae4.tar.gz servo-d8e92bb271a9f9dd87bf77e38cd820d01f2f0ae4.zip | |
Rename Reflectable::global_scope to global
Diffstat (limited to 'components/script/dom/promise.rs')
| -rw-r--r-- | components/script/dom/promise.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/promise.rs b/components/script/dom/promise.rs index 9c1feb0154d..c0842dce4fa 100644 --- a/components/script/dom/promise.rs +++ b/components/script/dom/promise.rs @@ -61,7 +61,7 @@ impl PromiseHelper for Rc<Promise> { impl Drop for Promise { #[allow(unsafe_code)] fn drop(&mut self) { - let cx = self.global_scope().get_cx(); + let cx = self.global().get_cx(); unsafe { RemoveRawValueRoot(cx, self.permanent_js_root.get_unsafe()); } @@ -81,7 +81,7 @@ impl Promise { #[allow(unsafe_code, unrooted_must_root)] pub fn duplicate(&self) -> Rc<Promise> { - let cx = self.global_scope().get_cx(); + let cx = self.global().get_cx(); unsafe { Promise::new_with_js_promise(self.reflector().get_jsobject(), cx) } @@ -166,7 +166,7 @@ impl Promise { pub fn reject_error(&self, cx: *mut JSContext, error: Error) { rooted!(in(cx) let mut v = UndefinedValue()); unsafe { - error.to_jsval(cx, &self.global_scope(), v.handle_mut()); + error.to_jsval(cx, &self.global(), v.handle_mut()); } self.reject(cx, v.handle()); } @@ -210,7 +210,7 @@ impl Promise { #[allow(unsafe_code)] pub fn append_native_handler(&self, handler: &PromiseNativeHandler) { - let cx = self.global_scope().get_cx(); + let cx = self.global().get_cx(); rooted!(in(cx) let resolve_func = create_native_handler_function(cx, handler.reflector().get_jsobject(), |