From 1f55db99bb8d3bad47d15baf27a905ab6f950964 Mon Sep 17 00:00:00 2001
From: Tim Kuehn <tkuehn@cmu.edu>
Date: Wed, 3 Jul 2013 16:32:50 -0700
Subject: [PATCH] removed unused constellation chan from render task

---
 src/components/gfx/render_task.rs      | 7 -------
 src/components/main/compositing/mod.rs | 3 +--
 src/components/main/pipeline.rs        | 1 -
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/components/gfx/render_task.rs b/src/components/gfx/render_task.rs
index 134f601c8a9..e81337ef0ef 100644
--- a/src/components/gfx/render_task.rs
+++ b/src/components/gfx/render_task.rs
@@ -9,7 +9,6 @@ use azure::azure_hl::{B8G8R8A8, DrawTarget};
 use display_list::DisplayList;
 use servo_msg::compositor_msg::{RenderListener, IdleRenderState, RenderingRenderState, LayerBuffer};
 use servo_msg::compositor_msg::{LayerBufferSet};
-use servo_msg::constellation_msg::{ConstellationChan};
 use font_context::FontContext;
 use geom::matrix2d::Matrix2D;
 use geom::point::Point2D;
@@ -70,8 +69,6 @@ priv struct RenderTask<C> {
 
     /// The layer to be rendered
     render_layer: Option<RenderLayer>,
-    /// A channel to the constellation for -- just in case
-    constellation_chan: ConstellationChan,
     /// Permission to send paint messages to the compositor
     paint_permission: bool,
     /// Cached copy of last layers rendered
@@ -83,19 +80,16 @@ impl<C: RenderListener + Owned> RenderTask<C> {
                   port: Port<Msg>,
                   compositor: C,
                   opts: Opts,
-                  constellation_chan: ConstellationChan,
                   profiler_chan: ProfilerChan) {
         let compositor = Cell::new(compositor);
         let opts = Cell::new(opts);
         let port = Cell::new(port);
-        let constellation_chan = Cell::new(constellation_chan);
         let profiler_chan = Cell::new(profiler_chan);
 
         do spawn {
             let compositor = compositor.take();
             let share_gl_context = compositor.get_gl_context();
             let opts = opts.take();
-            let constellation_chan = constellation_chan.take();
             let profiler_chan = profiler_chan.take();
 
             // FIXME: rust/#5967
@@ -111,7 +105,6 @@ impl<C: RenderListener + Owned> RenderTask<C> {
                 share_gl_context: share_gl_context,
                 render_layer: None,
 
-                constellation_chan: constellation_chan,
                 paint_permission: false,
                 last_paint_msg: None,
             };
diff --git a/src/components/main/compositing/mod.rs b/src/components/main/compositing/mod.rs
index a02fec3b312..ebd1a81636f 100644
--- a/src/components/main/compositing/mod.rs
+++ b/src/components/main/compositing/mod.rs
@@ -23,7 +23,6 @@ use std::comm;
 use std::comm::{Chan, SharedChan, Port};
 use std::num::Orderable;
 use std::task;
-use std::util;
 use geom::matrix::identity;
 use geom::point::Point2D;
 use geom::size::Size2D;
@@ -289,7 +288,7 @@ impl CompositorTask {
                         // Iterate over the children of the container layer.
                         let mut current_layer_child = root_layer.first_child;
 
-                        for new_layer_buffer_set.buffers.each |buffer| {
+                        for new_layer_buffer_set.buffers.iter().advance |buffer| {
                             let width = buffer.rect.size.width as uint;
                             let height = buffer.rect.size.height as uint;
 
diff --git a/src/components/main/pipeline.rs b/src/components/main/pipeline.rs
index f5b6cf9c664..ab9ccc6cade 100644
--- a/src/components/main/pipeline.rs
+++ b/src/components/main/pipeline.rs
@@ -47,7 +47,6 @@ impl Pipeline {
                            render_port,
                            compositor_chan.clone(),
                            copy opts,
-                           constellation_chan.clone(),
                            profiler_chan.clone());
 
         LayoutTask::create(layout_port,