Rename content to content_task

src/servo/content/content_task.rs

@@ -3,10 +3,9 @@
     tasks.
 "]
 
-export Content;
+export ContentTask;
 export ControlMsg, ExecuteMsg, ParseMsg, ExitMsg;
 export PingMsg, PongMsg;
-export create_content;
 export Document;
 
 import std::arc::{arc, clone};
@@ -51,6 +50,14 @@ enum PingMsg {
     PongMsg
 }
 
+type ContentTask = Chan<ControlMsg>;
+
+fn ContentTask<S: Compositor send copy>(layout_task: LayoutTask, compositor: S, resource_task: ResourceTask) -> ContentTask {
+    do spawn_listener::<ControlMsg> |from_master| {
+        Content(layout_task, compositor, from_master, resource_task).start();
+    }
+}
+
 #[doc="Sends a ping to layout and waits for the response."]
 #[allow(non_implicitly_copyable_typarams)]
 fn join_layout(scope: NodeScope, layout_task: LayoutTask) {
@@ -232,10 +239,3 @@ struct Content<C:Compositor send copy> {
         }
     }
 }
-
-fn create_content<S: Compositor send copy>(layout_task: LayoutTask, compositor: S, resource_task: ResourceTask) -> Chan<ControlMsg> {
-    do spawn_listener::<ControlMsg> |from_master| {
-        Content(layout_task, compositor, from_master, resource_task).start();
-    }
-}
-

src/servo/dom/base.rs

@@ -11,7 +11,7 @@ import js::crust::*;
 import js::glue::bindgen::RUST_OBJECT_TO_JSVAL;
 import dvec::{DVec, dvec};
 import ptr::null;
-import content::Document;
+import content::content_task::Document;
 import bindings;
 
 enum NodeData = {

src/servo/dom/bindings/document.rs

@@ -12,7 +12,7 @@ import ptr::null;
 import libc::c_uint;
 import utils::{DOMString, domstring_to_jsval, rust_box, squirrel_away, str};
 import bindings::node::create;
-import content::Document;
+import content::content_task::Document;
 
 enum DOMException {
     INVALID_CHARACTER_ERR

src/servo/engine.rs

@@ -4,7 +4,8 @@ import render_task::RenderTask;
 import pipes::{spawn_service, select};
 import layout::layout_task;
 import layout_task::LayoutTask;
-import content::{Content, ExecuteMsg, ParseMsg, ExitMsg, create_content};
+import content::content_task;
+import content_task::{ContentTask};
 import resource::resource_task;
 import resource::resource_task::{ResourceTask};
 import std::net::url::url;
@@ -24,7 +25,7 @@ struct Engine<C:Compositor send copy> {
     let resource_task: ResourceTask;
     let image_cache_task: ImageCacheTask;
     let layout_task: LayoutTask;
-    let content: comm::Chan<content::ControlMsg>;
+    let content_task: ContentTask;
 
     new(+compositor: C) {
         self.compositor = compositor;
@@ -33,13 +34,13 @@ struct Engine<C:Compositor send copy> {
         let resource_task = ResourceTask();
         let image_cache_task = image_cache_task(resource_task);
         let layout_task = LayoutTask(render_task, image_cache_task);
-        let content = create_content(layout_task, compositor, resource_task);
+        let content_task = ContentTask(layout_task, compositor, resource_task);
 
         self.render_task = render_task;
         self.resource_task = resource_task;
         self.image_cache_task = image_cache_task;
         self.layout_task = layout_task;
-        self.content = content;
+        self.content_task = content_task;
     }
 
     fn start() -> EngineProto::client::Running {
@@ -54,15 +55,15 @@ struct Engine<C:Compositor send copy> {
                             // TODO: change copy to move once we have match move
                             let url = move_ref!(url);
                             if url.path.ends_with(".js") {
-                                self.content.send(ExecuteMsg(url))
+                                self.content_task.send(content_task::ExecuteMsg(url))
                             } else {
-                                self.content.send(ParseMsg(url))
+                                self.content_task.send(content_task::ParseMsg(url))
                             }
                             request = next;
                         },
                         
                         Exit -> channel {
-                            self.content.send(content::ExitMsg);
+                            self.content_task.send(content_task::ExitMsg);
                             self.layout_task.send(layout_task::ExitMsg);
                             
                             let (response_chan, response_port) =

src/servo/layout/layout_task.rs

@@ -14,6 +14,7 @@ import resource::image_cache_task::ImageCacheTask;
 import std::net::url::url;
 import style::apply::apply_style;
 import dom::event::{Event, ReflowEvent};
+import content::content_task;
 
 import task::*;
 import comm::*;
@@ -22,7 +23,7 @@ type LayoutTask = Chan<Msg>;
 
 enum Msg {
     BuildMsg(Node, arc<Stylesheet>, url, Chan<Event>),
-    PingMsg(Chan<content::PingMsg>),
+    PingMsg(Chan<content_task::PingMsg>),
     ExitMsg
 }
 
@@ -30,7 +31,7 @@ fn LayoutTask(render_task: RenderTask, image_cache_task: ImageCacheTask) -> Layo
     do spawn_listener::<Msg>|request| {
         loop {
             match request.recv() {
-              PingMsg(ping_channel) => ping_channel.send(content::PongMsg),
+              PingMsg(ping_channel) => ping_channel.send(content_task::PongMsg),
               ExitMsg => {
                 #debug("layout: ExitMsg received");
                 break;

src/servo/servo.rc

@@ -106,6 +106,7 @@ mod util {
 
 #[allow(non_implicitly_copyable_typarams)]
 mod content {
+    mod content_task;
 }
 
 mod opts;