Rename Layout to LayoutTask

3 files changed, 19 insertions, 19 deletions

diff --git a/src/servo/content.rs b/src/servo/content.rs
index 89c426c47e3..af15ae39818 100644
--- a/src/servo/content.rs
+++ b/src/servo/content.rs
@@ -23,7 +23,7 @@ import gfx::compositor::Compositor;
 import parser::html_lexer::spawn_html_lexer_task;
 import parser::html_builder::build_dom;
 import layout::layout_task;
-import layout_task::{Layout, BuildMsg};
+import layout_task::{LayoutTask, BuildMsg};
 
 import jsrt = js::rust::rt;
 import js::rust::methods;
@@ -53,11 +53,11 @@ enum PingMsg {
 
 #[doc="Sends a ping to layout and waits for the response."]
 #[allow(non_implicitly_copyable_typarams)]
-fn join_layout(scope: NodeScope, layout: Layout) {
+fn join_layout(scope: NodeScope, layout_task: LayoutTask) {
 
     if scope.is_reader_forked() {
         listen(|response_from_layout| {
-            layout.send(layout_task::PingMsg(response_from_layout));
+            layout_task.send(layout_task::PingMsg(response_from_layout));
             response_from_layout.recv();
         });
         scope.reader_joined();
@@ -76,7 +76,7 @@ struct Document {
 
 struct Content<C:Compositor send copy> {
     let compositor: C;
-    let layout: Layout;
+    let layout_task: LayoutTask;
     let from_master: comm::Port<ControlMsg>;
     let event_port: comm::Port<Event>;
 
@@ -88,9 +88,9 @@ struct Content<C:Compositor send copy> {
 
     let resource_task: ResourceTask;
 
-    new(layout: Layout, compositor: C, from_master: Port<ControlMsg>,
+    new(layout_task: LayoutTask, compositor: C, from_master: Port<ControlMsg>,
         resource_task: ResourceTask) {
-        self.layout = layout;
+        self.layout_task = layout_task;
         self.compositor = compositor;
         self.from_master = from_master;
         self.event_port = port();
@@ -179,7 +179,7 @@ struct Content<C:Compositor send copy> {
           }
 
           ExitMsg => {
-            self.layout.send(layout_task::ExitMsg);
+            self.layout_task.send(layout_task::ExitMsg);
             return false;
           }
         }
@@ -190,11 +190,11 @@ struct Content<C:Compositor send copy> {
 
         // Now, join the layout so that they will see the latest
         // changes we have made.
-        join_layout(self.scope, self.layout);
+        join_layout(self.scope, self.layout_task);
 
         // Send new document and relevant styles to layout
         // FIXME: Put CSS rules in an arc or something.
-        self.layout.send(BuildMsg(document.root, clone(&document.css_rules), copy *doc_url, self.event_port.chan()));
+        self.layout_task.send(BuildMsg(document.root, clone(&document.css_rules), copy *doc_url, self.event_port.chan()));
 
         // Indicate that reader was forked so any further
         // changes will be isolated.
@@ -233,9 +233,9 @@ struct Content<C:Compositor send copy> {
     }
 }
 
-fn create_content<S: Compositor send copy>(layout: Layout, compositor: S, resource_task: ResourceTask) -> Chan<ControlMsg> {
+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, compositor, from_master, resource_task).start();
+        Content(layout_task, compositor, from_master, resource_task).start();
     }
 }
 
diff --git a/src/servo/engine.rs b/src/servo/engine.rs
index 6085e7fce6a..79330c9d032 100644
--- a/src/servo/engine.rs
+++ b/src/servo/engine.rs
@@ -3,7 +3,7 @@ import gfx::render_task;
 import render_task::RenderTask;
 import pipes::{spawn_service, select};
 import layout::layout_task;
-import layout_task::Layout;
+import layout_task::LayoutTask;
 import content::{Content, ExecuteMsg, ParseMsg, ExitMsg, create_content};
 import resource::resource_task;
 import resource::resource_task::{ResourceTask};
@@ -23,7 +23,7 @@ struct Engine<C:Compositor send copy> {
     let render_task: RenderTask;
     let resource_task: ResourceTask;
     let image_cache_task: ImageCacheTask;
-    let layout: Layout;
+    let layout_task: LayoutTask;
     let content: comm::Chan<content::ControlMsg>;
 
     new(+compositor: C) {
@@ -32,13 +32,13 @@ struct Engine<C:Compositor send copy> {
         let render_task = RenderTask(compositor);
         let resource_task = ResourceTask();
         let image_cache_task = image_cache_task(resource_task);
-        let layout = Layout(render_task, image_cache_task);
-        let content = create_content(layout, compositor, resource_task);
+        let layout_task = LayoutTask(render_task, image_cache_task);
+        let content = create_content(layout_task, compositor, resource_task);
 
         self.render_task = render_task;
         self.resource_task = resource_task;
         self.image_cache_task = image_cache_task;
-        self.layout = layout;
+        self.layout_task = layout_task;
         self.content = content;
     }
 
@@ -63,7 +63,7 @@ struct Engine<C:Compositor send copy> {
                         
                         Exit -> channel {
                             self.content.send(content::ExitMsg);
-                            self.layout.send(layout_task::ExitMsg);
+                            self.layout_task.send(layout_task::ExitMsg);
                             
                             let (response_chan, response_port) =
                                 pipes::stream();
diff --git a/src/servo/layout/layout_task.rs b/src/servo/layout/layout_task.rs
index 2c57b241884..70e76b583e9 100644
--- a/src/servo/layout/layout_task.rs
+++ b/src/servo/layout/layout_task.rs
@@ -18,7 +18,7 @@ import dom::event::{Event, ReflowEvent};
 import task::*;
 import comm::*;
 
-type Layout = Chan<Msg>;
+type LayoutTask = Chan<Msg>;
 
 enum Msg {
     BuildMsg(Node, arc<Stylesheet>, url, Chan<Event>),
@@ -26,7 +26,7 @@ enum Msg {
     ExitMsg
 }
 
-fn Layout(render_task: RenderTask, image_cache_task: ImageCacheTask) -> Layout {
+fn LayoutTask(render_task: RenderTask, image_cache_task: ImageCacheTask) -> LayoutTask {
     do spawn_listener::<Msg>|request| {
         loop {
             match request.recv() {