auto merge of #1457 : zmike/servo/master, r=jdm

this should resolve #1169

4 files changed, 10 insertions, 6 deletions

diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs
index f9ba483c4f9..bb0a39ae902 100644
--- a/src/components/script/dom/window.rs
+++ b/src/components/script/dom/window.rs
@@ -16,6 +16,7 @@ use layout_interface::{ReflowForDisplay, DocumentDamageLevel};
 use script_task::{ExitWindowMsg, FireTimerMsg, Page, ScriptChan};
 use servo_msg::compositor_msg::ScriptListener;
 use servo_net::image_cache_task::ImageCacheTask;
+use servo_util::task::{spawn_named};
 
 use js::glue::*;
 use js::jsapi::{JSObject, JSContext, JS_DefineProperty, JSTracer, JSVal};
@@ -193,7 +194,7 @@ impl Window {
         let tm = Timer::new().unwrap();
         let (cancel_port, cancel_chan) = Chan::new();
         let chan = self.timer_chan.clone();
-        spawn(proc() {
+        spawn_named("Window:SetTimeout", proc() {
             let mut tm = tm;
             let mut timeout_port = tm.oneshot(timeout);
             let mut cancel_port = cancel_port;
@@ -248,7 +249,7 @@ impl Window {
             timer_chan: {
                 let (timer_port, timer_chan): (Port<TimerControlMsg>, SharedChan<TimerControlMsg>) = SharedChan::new();
                 let id = page.id.clone();
-                spawn(proc() {
+                spawn_named("timer controller", proc() {
                     loop {
                         match timer_port.recv() {
                             TimerMessage_Close => break,
diff --git a/src/components/script/html/cssparse.rs b/src/components/script/html/cssparse.rs
index 5f5ba17653b..0576ee5301a 100644
--- a/src/components/script/html/cssparse.rs
+++ b/src/components/script/html/cssparse.rs
@@ -9,6 +9,7 @@ use encoding::EncodingRef;
 use encoding::all::UTF_8;
 use style::Stylesheet;
 use servo_net::resource_task::{Load, LoadResponse, ProgressMsg, Payload, Done, ResourceTask};
+use servo_util::task::spawn_named;
 use extra::url::Url;
 
 /// Where a style sheet comes from.
@@ -25,7 +26,7 @@ pub fn spawn_css_parser(provenance: StylesheetProvenance,
     // TODO: Get the actual value. http://dev.w3.org/csswg/css-syntax/#environment-encoding
     let environment_encoding = UTF_8 as EncodingRef;
 
-    spawn(proc() {
+    spawn_named("cssparser", proc() {
         // TODO: CSS parsing should take a base URL.
         let _url = match provenance {
             UrlProvenance(ref the_url) => (*the_url).clone(),
diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs
index c59ef9ab376..5d9e955714a 100644
--- a/src/components/script/html/hubbub_html_parser.rs
+++ b/src/components/script/html/hubbub_html_parser.rs
@@ -21,6 +21,7 @@ use servo_msg::constellation_msg::SubpageId;
 use servo_net::image_cache_task::ImageCacheTask;
 use servo_net::resource_task::{Load, Payload, Done, ResourceTask, load_whole_resource};
 use servo_util::url::make_url;
+use servo_util::task::spawn_named;
 use std::cast;
 use std::cell::RefCell;
 use std::comm::{Port, SharedChan};
@@ -255,7 +256,7 @@ pub fn parse_html(cx: *JSContext,
     let (discovery_port, discovery_chan) = SharedChan::new();
     let stylesheet_chan = discovery_chan.clone();
     let (css_msg_port, css_chan) = SharedChan::new();
-    spawn(proc() {
+    spawn_named("parse_html:css", proc() {
         css_link_listener(stylesheet_chan, css_msg_port, resource_task2.clone());
     });
 
@@ -263,7 +264,7 @@ pub fn parse_html(cx: *JSContext,
     let resource_task2 = resource_task.clone();
     let js_result_chan = discovery_chan.clone();
     let (js_msg_port, js_chan) = SharedChan::new();
-    spawn(proc() {
+    spawn_named("parse_html:js", proc() {
         js_script_listener(js_result_chan, js_msg_port, resource_task2.clone());
     });
 
diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs
index 4b70c13f0cc..faec6d8031b 100644
--- a/src/components/script/script_task.rs
+++ b/src/components/script/script_task.rs
@@ -46,6 +46,7 @@ use servo_net::image_cache_task::ImageCacheTask;
 use servo_net::resource_task::ResourceTask;
 use servo_util::geometry::to_frac_px;
 use servo_util::url::make_url;
+use servo_util::task::spawn_named;
 use std::comm::{Port, SharedChan};
 use std::ptr;
 use std::str::eq_slice;
@@ -462,7 +463,7 @@ impl ScriptTask {
                   resource_task: ResourceTask,
                   image_cache_task: ImageCacheTask,
                   window_size: Size2D<uint>) {
-        spawn(proc() {
+        spawn_named("ScriptTask", proc() {
             let script_task = ScriptTask::new(id,
                                               @compositor as @ScriptListener,
                                               layout_chan,