From b5f73fb1797ad3e1ad3df4a7f9f308b7b41d4c28 Mon Sep 17 00:00:00 2001 From: Tetsuharu OHZEKI Date: Mon, 8 Dec 2014 11:58:57 +0900 Subject: [PATCH] Rename RenderListener -> PaintListener, and its methods. --- components/compositing/compositor_task.rs | 10 +++++----- components/gfx/paint_task.rs | 12 ++++++------ components/msg/compositor_msg.rs | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/components/compositing/compositor_task.rs b/components/compositing/compositor_task.rs index 674b239de65..1da5716fd70 100644 --- a/components/compositing/compositor_task.rs +++ b/components/compositing/compositor_task.rs @@ -18,7 +18,7 @@ use geom::size::Size2D; use layers::platform::surface::{NativeCompositingGraphicsContext, NativeGraphicsMetadata}; use layers::layers::LayerBufferSet; use servo_msg::compositor_msg::{Epoch, LayerId, LayerMetadata, ReadyState}; -use servo_msg::compositor_msg::{RenderListener, RenderState, ScriptListener, ScrollPolicy}; +use servo_msg::compositor_msg::{PaintListener, RenderState, ScriptListener, ScrollPolicy}; use servo_msg::constellation_msg::{ConstellationChan, PipelineId}; use servo_util::memory::MemoryProfilerChan; use servo_util::time::TimeProfilerChan; @@ -108,8 +108,8 @@ impl LayerProperties { } } -/// Implementation of the abstract `RenderListener` interface. -impl RenderListener for Box { +/// Implementation of the abstract `PaintListener` interface. +impl PaintListener for Box { fn get_graphics_metadata(&mut self) -> Option { let (chan, port) = channel(); self.send(GetGraphicsMetadata(chan)); @@ -142,11 +142,11 @@ impl RenderListener for Box { } } - fn render_msg_discarded(&mut self) { + fn paint_msg_discarded(&mut self) { self.send(PaintMsgDiscarded); } - fn set_render_state(&mut self, pipeline_id: PipelineId, render_state: RenderState) { + fn set_paint_state(&mut self, pipeline_id: PipelineId, render_state: RenderState) { self.send(ChangePaintState(pipeline_id, render_state)) } } diff --git a/components/gfx/paint_task.rs b/components/gfx/paint_task.rs index 1f1f47119fa..a537f3d7e83 100644 --- a/components/gfx/paint_task.rs +++ b/components/gfx/paint_task.rs @@ -22,7 +22,7 @@ use layers::layers::{BufferRequest, LayerBuffer, LayerBufferSet}; use layers; use native::task::NativeTaskBuilder; use servo_msg::compositor_msg::{Epoch, IdleRenderState, LayerId}; -use servo_msg::compositor_msg::{LayerMetadata, RenderListener, RenderingRenderState, ScrollPolicy}; +use servo_msg::compositor_msg::{LayerMetadata, PaintListener, RenderingRenderState, ScrollPolicy}; use servo_msg::constellation_msg::{ConstellationChan, Failure, FailureMsg, PipelineId}; use servo_msg::constellation_msg::{RendererReadyMsg}; use servo_msg::platform::surface::NativeSurfaceAzureMethods; @@ -136,7 +136,7 @@ fn initialize_layers(compositor: &mut C, pipeline_id: PipelineId, epoch: Epoch, root_stacking_context: &StackingContext) - where C: RenderListener { + where C: PaintListener { let mut metadata = Vec::new(); build(&mut metadata, root_stacking_context, &ZERO_POINT); compositor.initialize_layers_for_pipeline(pipeline_id, metadata, epoch); @@ -167,7 +167,7 @@ fn initialize_layers(compositor: &mut C, } } -impl PaintTask where C: RenderListener + Send { +impl PaintTask where C: PaintListener + Send { pub fn create(id: PipelineId, port: Receiver, compositor: C, @@ -248,12 +248,12 @@ impl PaintTask where C: RenderListener + Send { debug!("paint_task: render ready msg"); let ConstellationChan(ref mut c) = self.constellation_chan; c.send(RendererReadyMsg(self.id)); - self.compositor.render_msg_discarded(); + self.compositor.paint_msg_discarded(); continue; } let mut replies = Vec::new(); - self.compositor.set_render_state(self.id, RenderingRenderState); + self.compositor.set_paint_state(self.id, RenderingRenderState); for PaintRequest { buffer_requests, scale, layer_id, epoch } in requests.into_iter() { if self.epoch == epoch { @@ -263,7 +263,7 @@ impl PaintTask where C: RenderListener + Send { } } - self.compositor.set_render_state(self.id, IdleRenderState); + self.compositor.set_paint_state(self.id, IdleRenderState); debug!("paint_task: returning surfaces"); self.compositor.paint(self.id, self.epoch, replies); diff --git a/components/msg/compositor_msg.rs b/components/msg/compositor_msg.rs index 9c82d790fd2..d4e8e208223 100644 --- a/components/msg/compositor_msg.rs +++ b/components/msg/compositor_msg.rs @@ -83,7 +83,7 @@ pub struct LayerMetadata { /// The interface used by the renderer to acquire draw targets for each render frame and /// submit them to be drawn to the display. -pub trait RenderListener for Sized? { +pub trait PaintListener for Sized? { fn get_graphics_metadata(&mut self) -> Option; /// Informs the compositor of the layers for the given pipeline. The compositor responds by @@ -99,8 +99,8 @@ pub trait RenderListener for Sized? { epoch: Epoch, replies: Vec<(LayerId, Box)>); - fn render_msg_discarded(&mut self); - fn set_render_state(&mut self, PipelineId, RenderState); + fn paint_msg_discarded(&mut self); + fn set_paint_state(&mut self, PipelineId, RenderState); } /// The interface used by the script task to tell the compositor to update its ready state,