Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-09 15:35:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Inline DedicatedWorkerGlobalScope::init.

Browse source 
This was an unnecessary abstraction.
This commit is contained in:
Ms2ger 2014-07-17 15:45:32 +02:00
parent 603c0b889a
commit 31376a6a79
2 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/script/dom/dedicatedworkerglobalscope.rs
View file

@ -38,15 +38,6 @@ impl DedicatedWorkerGlobalScope {
let scope = box DedicatedWorkerGlobalScope::new_inherited(cx.clone()); let scope = box DedicatedWorkerGlobalScope::new_inherited(cx.clone());
DedicatedWorkerGlobalScopeBinding::Wrap(cx.ptr, scope) DedicatedWorkerGlobalScopeBinding::Wrap(cx.ptr, scope)
} }
pub fn init() -> Temporary<DedicatedWorkerGlobalScope> {
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<Cx> {
self.workerglobalscope.get_rust_cx()
}
} }
impl DedicatedWorkerGlobalScope { impl DedicatedWorkerGlobalScope {
@ -67,8 +58,9 @@ impl DedicatedWorkerGlobalScope {
} }
}; };
let global = DedicatedWorkerGlobalScope::init().root(); let (_js_runtime, js_context) = ScriptTask::new_rt_and_cx();
match global.get_rust_cx().evaluate_script( let global = DedicatedWorkerGlobalScope::new(js_context.clone()).root();
match js_context.evaluate_script(
global.reflector().get_jsobject(), source, filename.to_str(), 1) { global.reflector().get_jsobject(), source, filename.to_str(), 1) {
Ok(_) => (), Ok(_) => (),
Err(_) => println!("evaluate_script failed") Err(_) => println!("evaluate_script failed")

3
src/components/script/dom/workerglobalscope.rs
View file

@ -37,9 +37,6 @@ impl WorkerGlobalScope {
} }
} }
pub fn get_rust_cx<'a>(&'a self) -> &'a Rc<Cx> {
&*self.js_context
}
pub fn get_cx(&self) -> *mut JSContext { pub fn get_cx(&self) -> *mut JSContext {
self.js_context.ptr self.js_context.ptr
} }