From 79722bdc031db5e8ee7bbd860ba75a43654fd572 Mon Sep 17 00:00:00 2001
From: Tetsuharu OHZEKI <saneyuki.snyk@gmail.com>
Date: Mon, 8 Dec 2014 11:52:31 +0900
Subject: [PATCH] Rename gfx::paint_task::Msg

---
 components/compositing/compositor.rs | 6 +++---
 components/gfx/paint_task.rs         | 8 ++++----
 components/layout/layout_task.rs     | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
index 1d1007e3ec3..2f0b2c1ea58 100644
--- a/components/compositing/compositor.rs
+++ b/components/compositing/compositor.rs
@@ -29,7 +29,7 @@ use geom::point::{Point2D, TypedPoint2D};
 use geom::rect::{Rect, TypedRect};
 use geom::size::TypedSize2D;
 use geom::scale_factor::ScaleFactor;
-use gfx::paint_task::{PaintChan, RenderMsg, PaintRequest, UnusedBufferMsg};
+use gfx::paint_task::{PaintChan, PaintMsg, PaintRequest, UnusedBufferMsg};
 use layers::geometry::{DevicePixel, LayerPixel};
 use layers::layers::{BufferRequest, Layer, LayerBufferSet};
 use layers::rendergl;
@@ -379,7 +379,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
     }
 
     fn has_render_msg_tracking(&self) -> bool {
-        // only track RenderMsg's if the compositor outputs to a file.
+        // only track PaintMsg's if the compositor outputs to a file.
         opts::get().output_file.is_some()
     }
 
@@ -928,7 +928,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
         let mut num_render_msgs_sent = 0;
         for (_pipeline_id, (chan, requests)) in pipeline_requests.into_iter() {
             num_render_msgs_sent += 1;
-            let _ = chan.send_opt(RenderMsg(requests));
+            let _ = chan.send_opt(PaintMsg(requests));
         }
 
         self.add_outstanding_render_msg(num_render_msgs_sent);
diff --git a/components/gfx/paint_task.rs b/components/gfx/paint_task.rs
index cbcbd7b3ea8..1f1f47119fa 100644
--- a/components/gfx/paint_task.rs
+++ b/components/gfx/paint_task.rs
@@ -68,8 +68,8 @@ pub struct PaintRequest {
 }
 
 pub enum Msg {
-    RenderInitMsg(Arc<StackingContext>),
-    RenderMsg(Vec<PaintRequest>),
+    PaintInitMsg(Arc<StackingContext>),
+    PaintMsg(Vec<PaintRequest>),
     UnusedBufferMsg(Vec<Box<LayerBuffer>>),
     PaintPermissionGranted,
     PaintPermissionRevoked,
@@ -227,7 +227,7 @@ impl<C> PaintTask<C> where C: RenderListener + Send {
 
         loop {
             match self.port.recv() {
-                RenderInitMsg(stacking_context) => {
+                PaintInitMsg(stacking_context) => {
                     self.epoch.next();
                     self.root_stacking_context = Some(stacking_context.clone());
 
@@ -243,7 +243,7 @@ impl<C> PaintTask<C> where C: RenderListener + Send {
                                       self.epoch,
                                       &*stacking_context);
                 }
-                RenderMsg(requests) => {
+                PaintMsg(requests) => {
                     if !self.paint_permission {
                         debug!("paint_task: render ready msg");
                         let ConstellationChan(ref mut c) = self.constellation_chan;
diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs
index 2abab9d2894..e7eb5b57e22 100644
--- a/components/layout/layout_task.rs
+++ b/components/layout/layout_task.rs
@@ -28,7 +28,7 @@ use geom::scale_factor::ScaleFactor;
 use gfx::color;
 use gfx::display_list::{DisplayList, OpaqueNode, StackingContext};
 use gfx::font_cache_task::FontCacheTask;
-use gfx::paint_task::{mod, RenderInitMsg, PaintChan, PaintLayer};
+use gfx::paint_task::{mod, PaintInitMsg, PaintChan, PaintLayer};
 use layout_traits;
 use layout_traits::{LayoutControlMsg, LayoutTaskFactory};
 use log;
@@ -690,7 +690,7 @@ impl LayoutTask {
 
             debug!("Layout done!");
 
-            self.paint_chan.send(RenderInitMsg(stacking_context));
+            self.paint_chan.send(PaintInitMsg(stacking_context));
         });
     }