Move the code to start the worker into DedicatedWorkerGlobalScope::run_worker_scope.

This is somewhat cleaner than keeping it all in the Worker constructor.

1 files changed, 35 insertions, 1 deletions

diff --git a/src/components/script/dom/dedicatedworkerglobalscope.rs b/src/components/script/dom/dedicatedworkerglobalscope.rs
index 13eb6c958da..4d554ec8871 100644
--- a/src/components/script/dom/dedicatedworkerglobalscope.rs
+++ b/src/components/script/dom/dedicatedworkerglobalscope.rs
@@ -4,17 +4,23 @@
 
 use dom::bindings::codegen::Bindings::DedicatedWorkerGlobalScopeBinding;
 use dom::bindings::codegen::InheritTypes::DedicatedWorkerGlobalScopeDerived;
-use dom::bindings::js::Temporary;
+use dom::bindings::js::{Temporary, RootCollection};
 use dom::bindings::utils::{Reflectable, Reflector};
 use dom::eventtarget::EventTarget;
 use dom::eventtarget::WorkerGlobalScopeTypeId;
 use dom::workerglobalscope::DedicatedGlobalScope;
 use dom::workerglobalscope::WorkerGlobalScope;
 use script_task::ScriptTask;
+use script_task::StackRootTLS;
+
+use servo_net::resource_task::{ResourceTask, load_whole_resource};
 
 use js::rust::Cx;
 
 use std::rc::Rc;
+use native;
+use rustrt::task::TaskOpts;
+use url::Url;
 
 #[deriving(Encodable)]
 pub struct DedicatedWorkerGlobalScope {
@@ -43,6 +49,34 @@ impl DedicatedWorkerGlobalScope {
     }
 }
 
+impl DedicatedWorkerGlobalScope {
+    pub fn run_worker_scope(worker_url: Url, resource_task: ResourceTask) {
+        let mut task_opts = TaskOpts::new();
+        task_opts.name = Some(format!("Web Worker at {}", worker_url).into_maybe_owned());
+        native::task::spawn_opts(task_opts, proc() {
+            let roots = RootCollection::new();
+            let _stack_roots_tls = StackRootTLS::new(&roots);
+
+            let (filename, source) = match load_whole_resource(&resource_task, worker_url.clone()) {
+                Err(_) => {
+                    println!("error loading script {}", worker_url);
+                    return;
+                }
+                Ok((metadata, bytes)) => {
+                    (metadata.final_url, String::from_utf8(bytes).unwrap())
+                }
+            };
+
+            let global = DedicatedWorkerGlobalScope::init().root();
+            match global.get_rust_cx().evaluate_script(
+                global.reflector().get_jsobject(), source, filename.to_str(), 1) {
+                Ok(_) => (),
+                Err(_) => println!("evaluate_script failed")
+            }
+        });
+    }
+}
+
 pub trait DedicatedWorkerGlobalScopeMethods {
 }