From b921986cd68e3692d7ad33b41da3fa7c880442b5 Mon Sep 17 00:00:00 2001 From: Tetsuharu OHZEKI Date: Mon, 8 Dec 2014 14:13:07 +0900 Subject: [PATCH] Rename RendererReadyMsg -> PainterReadyMsg --- components/compositing/constellation.rs | 4 ++-- components/gfx/paint_task.rs | 6 +++--- components/msg/constellation_msg.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/compositing/constellation.rs b/components/compositing/constellation.rs index 79f0283b54c..7e3907ebe64 100644 --- a/components/compositing/constellation.rs +++ b/components/compositing/constellation.rs @@ -21,7 +21,7 @@ use servo_msg::compositor_msg::LayerId; use servo_msg::constellation_msg::{ConstellationChan, ExitMsg, FailureMsg, Failure, FrameRectMsg}; use servo_msg::constellation_msg::{IFrameSandboxState, IFrameUnsandboxed, InitLoadUrlMsg}; use servo_msg::constellation_msg::{LoadCompleteMsg, LoadUrlMsg, LoadData, Msg, NavigateMsg}; -use servo_msg::constellation_msg::{NavigationType, PipelineId, RendererReadyMsg, ResizedWindowMsg}; +use servo_msg::constellation_msg::{NavigationType, PipelineId, PainterReadyMsg, ResizedWindowMsg}; use servo_msg::constellation_msg::{ScriptLoadedURLInIFrameMsg, SubpageId, WindowSizeData}; use servo_msg::constellation_msg::{KeyEvent, Key, KeyState, KeyModifiers}; use servo_msg::constellation_msg; @@ -453,7 +453,7 @@ impl Constellation { self.handle_navigate_msg(direction); } // Notification that rendering has finished and is requesting permission to paint. - RendererReadyMsg(pipeline_id) => { + PainterReadyMsg(pipeline_id) => { debug!("constellation got renderer ready message"); self.handle_renderer_ready_msg(pipeline_id); } diff --git a/components/gfx/paint_task.rs b/components/gfx/paint_task.rs index 79d81e4f091..4d4d3809bd8 100644 --- a/components/gfx/paint_task.rs +++ b/components/gfx/paint_task.rs @@ -24,7 +24,7 @@ use native::task::NativeTaskBuilder; use servo_msg::compositor_msg::{Epoch, IdlePaintState, LayerId}; use servo_msg::compositor_msg::{LayerMetadata, PaintListener, PaintingPaintState, ScrollPolicy}; use servo_msg::constellation_msg::{ConstellationChan, Failure, FailureMsg, PipelineId}; -use servo_msg::constellation_msg::{RendererReadyMsg}; +use servo_msg::constellation_msg::{PainterReadyMsg}; use servo_msg::platform::surface::NativeSurfaceAzureMethods; use servo_util::geometry::{Au, ZERO_POINT}; use servo_util::opts; @@ -234,7 +234,7 @@ impl PaintTask where C: PaintListener + Send { if !self.paint_permission { debug!("paint_task: render ready msg"); let ConstellationChan(ref mut c) = self.constellation_chan; - c.send(RendererReadyMsg(self.id)); + c.send(PainterReadyMsg(self.id)); continue; } @@ -247,7 +247,7 @@ impl PaintTask where C: PaintListener + Send { if !self.paint_permission { debug!("paint_task: render ready msg"); let ConstellationChan(ref mut c) = self.constellation_chan; - c.send(RendererReadyMsg(self.id)); + c.send(PainterReadyMsg(self.id)); self.compositor.paint_msg_discarded(); continue; } diff --git a/components/msg/constellation_msg.rs b/components/msg/constellation_msg.rs index 7734501abc2..483f03803cf 100644 --- a/components/msg/constellation_msg.rs +++ b/components/msg/constellation_msg.rs @@ -202,7 +202,7 @@ pub enum Msg { LoadUrlMsg(PipelineId, LoadData), ScriptLoadedURLInIFrameMsg(Url, PipelineId, SubpageId, IFrameSandboxState), NavigateMsg(NavigationDirection), - RendererReadyMsg(PipelineId), + PainterReadyMsg(PipelineId), ResizedWindowMsg(WindowSizeData), KeyEvent(Key, KeyState, KeyModifiers), }