From 8d56fa37be3a81d5cff818a99ed0407ef2e65446 Mon Sep 17 00:00:00 2001
From: Cameron Zwarich <zwarich@mozilla.com>
Date: Thu, 10 Jul 2014 01:31:48 -0700
Subject: [PATCH] Make ReRenderMsg take multiple ReRenderRequests

---
 src/components/compositing/compositor.rs |  4 +---
 src/components/gfx/render_task.rs        | 15 +++++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/components/compositing/compositor.rs b/src/components/compositing/compositor.rs
index 2bd4900735a..38cfdf5e46f 100644
--- a/src/components/compositing/compositor.rs
+++ b/src/components/compositing/compositor.rs
@@ -753,9 +753,7 @@ impl IOCompositor {
                                                                     rect,
                                                                     scale.get());
                 for (_pipeline_id, (chan, requests)) in request_map.move_iter() {
-                    for request in requests.move_iter() {
-                        let _ = chan.send_opt(ReRenderMsg(request));
-                    }
+                    let _ = chan.send_opt(ReRenderMsg(requests));
                 }
                 self.recomposite = self.recomposite || recomposite;
             }
diff --git a/src/components/gfx/render_task.rs b/src/components/gfx/render_task.rs
index a87a6738607..c2dffd8273b 100644
--- a/src/components/gfx/render_task.rs
+++ b/src/components/gfx/render_task.rs
@@ -59,7 +59,7 @@ pub struct ReRenderRequest {
 
 pub enum Msg {
     RenderMsg(SmallVec1<RenderLayer>),
-    ReRenderMsg(ReRenderRequest),
+    ReRenderMsg(Vec<ReRenderRequest>),
     UnusedBufferMsg(Vec<Box<LayerBuffer>>),
     PaintPermissionGranted,
     PaintPermissionRevoked,
@@ -237,11 +237,14 @@ impl<C:RenderListener + Send> RenderTask<C> {
                                       self.epoch,
                                       self.render_layers.as_slice());
                 }
-                ReRenderMsg(ReRenderRequest { buffer_requests, scale, layer_id, epoch }) => {
-                    if self.epoch == epoch {
-                        self.render(buffer_requests, scale, layer_id);
-                    } else {
-                        debug!("renderer epoch mismatch: {:?} != {:?}", self.epoch, epoch);
+                ReRenderMsg(requests) => {
+                    for ReRenderRequest { buffer_requests, scale, layer_id, epoch }
+                          in requests.move_iter() {
+                        if self.epoch == epoch {
+                            self.render(buffer_requests, scale, layer_id);
+                        } else {
+                            debug!("renderer epoch mismatch: {:?} != {:?}", self.epoch, epoch);
+                        }
                     }
                 }
                 UnusedBufferMsg(unused_buffers) => {