From 6077ed0ce8eceff97284657d3ae90ec08c9da810 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 1 Jan 2015 12:21:47 +0100 Subject: Rename GlobalRoot::root_ref() to GlobalRoot::r() for consistency. --- components/script/dom/worker.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'components/script/dom/worker.rs') diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs index b222311c37a..51f9962ed6b 100644 --- a/components/script/dom/worker.rs +++ b/components/script/dom/worker.rs @@ -89,13 +89,13 @@ impl Worker { let mut message = UndefinedValue(); unsafe { assert!(JS_ReadStructuredClone( - global.root_ref().get_cx(), data as *const u64, nbytes, + global.r().get_cx(), data as *const u64, nbytes, JS_STRUCTURED_CLONE_VERSION, &mut message, ptr::null(), ptr::null_mut()) != 0); } let target: JSRef = EventTargetCast::from_ref(worker.r()); - MessageEvent::dispatch_jsval(target, global.root_ref(), message); + MessageEvent::dispatch_jsval(target, global.r(), message); } } @@ -112,7 +112,7 @@ impl<'a> WorkerMethods for JSRef<'a, Worker> { return Err(DataClone); } - let address = Trusted::new(cx, self, self.global.root().root_ref().script_chan().clone()); + let address = Trusted::new(cx, self, self.global.root().r().script_chan().clone()); self.sender.send((address, ScriptMsg::DOMMessage(data, nbytes))); Ok(()) } -- cgit v1.2.3