From 11467e21bb2ed449b1761c8225bd8bea542c598c Mon Sep 17 00:00:00 2001
From: Jack Moffitt <jack@metajack.im>
Date: Fri, 10 May 2013 14:50:34 -0600
Subject: [PATCH] Work around broken TaskBuilder.

---
 src/servo/compositing/mod.rs      | 5 ++++-
 src/servo/content/content_task.rs | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/servo/compositing/mod.rs b/src/servo/compositing/mod.rs
index d2824674e4d..3ec1e9d7f36 100644
--- a/src/servo/compositing/mod.rs
+++ b/src/servo/compositing/mod.rs
@@ -288,7 +288,10 @@ fn Surface(backend: BackendType) -> Surface {
 /// A function for spawning into the platform's main thread.
 fn on_osmain<T: Owned>(f: ~fn(po: Port<T>)) -> Chan<T> {
     let (setup_po, setup_ch) = comm::stream();
-    do task::task().sched_mode(task::PlatformThread).spawn {
+    // FIXME: rust#6399
+    let mut main_task = task::task();
+    main_task.sched_mode(task::PlatformThread);
+    do main_task.spawn {
         let (po, ch) = comm::stream();
         setup_ch.send(ch);
         f(po);
diff --git a/src/servo/content/content_task.rs b/src/servo/content/content_task.rs
index 56d0959923a..d41c5e599ef 100644
--- a/src/servo/content/content_task.rs
+++ b/src/servo/content/content_task.rs
@@ -65,7 +65,10 @@ pub fn ContentTask(layout_task: LayoutTask,
     let dom_event_port = Cell(dom_event_port);
     let dom_event_chan = Cell(dom_event_chan);
 
-    do task().sched_mode(SingleThreaded).spawn {
+    // FIXME: rust#6399
+    let mut the_task = task();
+    the_task.sched_mode(SingleThreaded);
+    do the_task.spawn {
         let content = Content(layout_task.clone(),
                               control_port.take(),
                               control_chan_copy.clone(),