From 31376a6a796beba282cc0af1853b1fb5db603593 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 17 Jul 2014 15:45:32 +0200 Subject: [PATCH] Inline DedicatedWorkerGlobalScope::init. This was an unnecessary abstraction. --- .../script/dom/dedicatedworkerglobalscope.rs | 14 +++----------- src/components/script/dom/workerglobalscope.rs | 3 --- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/components/script/dom/dedicatedworkerglobalscope.rs b/src/components/script/dom/dedicatedworkerglobalscope.rs index 4d554ec8871..0f10552cdbe 100644 --- a/src/components/script/dom/dedicatedworkerglobalscope.rs +++ b/src/components/script/dom/dedicatedworkerglobalscope.rs @@ -38,15 +38,6 @@ impl DedicatedWorkerGlobalScope { let scope = box DedicatedWorkerGlobalScope::new_inherited(cx.clone()); DedicatedWorkerGlobalScopeBinding::Wrap(cx.ptr, scope) } - - pub fn init() -> Temporary { - let (_js_runtime, js_context) = ScriptTask::new_rt_and_cx(); - DedicatedWorkerGlobalScope::new(js_context.clone()) - } - - pub fn get_rust_cx<'a>(&'a self) -> &'a Rc { - self.workerglobalscope.get_rust_cx() - } } impl DedicatedWorkerGlobalScope { @@ -67,8 +58,9 @@ impl DedicatedWorkerGlobalScope { } }; - let global = DedicatedWorkerGlobalScope::init().root(); - match global.get_rust_cx().evaluate_script( + let (_js_runtime, js_context) = ScriptTask::new_rt_and_cx(); + let global = DedicatedWorkerGlobalScope::new(js_context.clone()).root(); + match js_context.evaluate_script( global.reflector().get_jsobject(), source, filename.to_str(), 1) { Ok(_) => (), Err(_) => println!("evaluate_script failed") diff --git a/src/components/script/dom/workerglobalscope.rs b/src/components/script/dom/workerglobalscope.rs index e6f9235723d..649de7628d9 100644 --- a/src/components/script/dom/workerglobalscope.rs +++ b/src/components/script/dom/workerglobalscope.rs @@ -37,9 +37,6 @@ impl WorkerGlobalScope { } } - pub fn get_rust_cx<'a>(&'a self) -> &'a Rc { - &*self.js_context - } pub fn get_cx(&self) -> *mut JSContext { self.js_context.ptr }