Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename compositor_task::Msg.

Browse source
This commit is contained in:
Tetsuharu OHZEKI 2014-12-08 11:54:59 +09:00
parent 79722bdc03
commit 94071f6330
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/compositing/compositor.rs
View file

@ -4,11 +4,11 @@
use compositor_layer::{CompositorData, CompositorLayer, DoesntWantScrollEvents}; use compositor_layer::{CompositorData, CompositorLayer, DoesntWantScrollEvents};
use compositor_layer::WantsScrollEvents; use compositor_layer::WantsScrollEvents;
use compositor_task::{ChangeReadyState, ChangeRenderState, CompositorEventListener}; use compositor_task::{ChangeReadyState, ChangePaintState, CompositorEventListener};
use compositor_task::{CompositorProxy, CompositorReceiver, CompositorTask}; use compositor_task::{CompositorProxy, CompositorReceiver, CompositorTask};
use compositor_task::{CreateOrUpdateDescendantLayer, CreateOrUpdateRootLayer, Exit}; use compositor_task::{CreateOrUpdateDescendantLayer, CreateOrUpdateRootLayer, Exit};
use compositor_task::{FrameTreeUpdateMsg, GetGraphicsMetadata, LayerProperties}; use compositor_task::{FrameTreeUpdateMsg, GetGraphicsMetadata, LayerProperties};
use compositor_task::{LoadComplete, Msg, Paint, RenderMsgDiscarded, ScrollFragmentPoint}; use compositor_task::{LoadComplete, Msg, Paint, PaintMsgDiscarded, ScrollFragmentPoint};
use compositor_task::{ScrollTimeout, SetIds, SetLayerOrigin, ShutdownComplete}; use compositor_task::{ScrollTimeout, SetIds, SetLayerOrigin, ShutdownComplete};
use constellation::{SendableFrameTree, FrameTreeDiff}; use constellation::{SendableFrameTree, FrameTreeDiff};
use pipeline::CompositionPipeline; use pipeline::CompositionPipeline;
@ -258,11 +258,11 @@ impl<Window: WindowMethods> IOCompositor<Window> {
self.change_ready_state(pipeline_id, ready_state); self.change_ready_state(pipeline_id, ready_state);
} }
(ChangeRenderState(pipeline_id, render_state), NotShuttingDown) => { (ChangePaintState(pipeline_id, render_state), NotShuttingDown) => {
self.change_render_state(pipeline_id, render_state); self.change_render_state(pipeline_id, render_state);
} }
(RenderMsgDiscarded, NotShuttingDown) => { (PaintMsgDiscarded, NotShuttingDown) => {
self.remove_outstanding_render_msg(); self.remove_outstanding_render_msg();
} }

12
components/compositing/compositor_task.rs
View file

@ -143,11 +143,11 @@ impl RenderListener for Box<CompositorProxy+'static+Send> {
} }
fn render_msg_discarded(&mut self) { fn render_msg_discarded(&mut self) {
self.send(RenderMsgDiscarded); self.send(PaintMsgDiscarded);
} }
fn set_render_state(&mut self, pipeline_id: PipelineId, render_state: RenderState) { fn set_render_state(&mut self, pipeline_id: PipelineId, render_state: RenderState) {
self.send(ChangeRenderState(pipeline_id, render_state)) self.send(ChangePaintState(pipeline_id, render_state))
} }
} }
@ -183,9 +183,9 @@ pub enum Msg {
/// Alerts the compositor to the current status of page loading. /// Alerts the compositor to the current status of page loading.
ChangeReadyState(PipelineId, ReadyState), ChangeReadyState(PipelineId, ReadyState),
/// Alerts the compositor to the current status of rendering. /// Alerts the compositor to the current status of rendering.
ChangeRenderState(PipelineId, RenderState), ChangePaintState(PipelineId, RenderState),
/// Alerts the compositor that the RenderMsg has been discarded. /// Alerts the compositor that the RenderMsg has been discarded.
RenderMsgDiscarded, PaintMsgDiscarded,
/// Sets the channel to the current layout and render tasks, along with their id /// Sets the channel to the current layout and render tasks, along with their id
SetIds(SendableFrameTree, Sender<()>, ConstellationChan), SetIds(SendableFrameTree, Sender<()>, ConstellationChan),
/// Sends an updated version of the frame tree. /// Sends an updated version of the frame tree.
@ -209,8 +209,8 @@ impl Show for Msg {
ScrollFragmentPoint(..) => write!(f, "ScrollFragmentPoint"), ScrollFragmentPoint(..) => write!(f, "ScrollFragmentPoint"),
Paint(..) => write!(f, "Paint"), Paint(..) => write!(f, "Paint"),
ChangeReadyState(..) => write!(f, "ChangeReadyState"), ChangeReadyState(..) => write!(f, "ChangeReadyState"),
ChangeRenderState(..) => write!(f, "ChangeRenderState"), ChangePaintState(..) => write!(f, "ChangePaintState"),
RenderMsgDiscarded(..) => write!(f, "RenderMsgDiscarded"), PaintMsgDiscarded(..) => write!(f, "PaintMsgDiscarded"),
SetIds(..) => write!(f, "SetIds"), SetIds(..) => write!(f, "SetIds"),
FrameTreeUpdateMsg(..) => write!(f, "FrameTreeUpdateMsg"), FrameTreeUpdateMsg(..) => write!(f, "FrameTreeUpdateMsg"),
LoadComplete => write!(f, "LoadComplete"), LoadComplete => write!(f, "LoadComplete"),

6
components/compositing/headless.rs
View file

@ -4,7 +4,7 @@
use compositor_task::{GetGraphicsMetadata, CreateOrUpdateRootLayer, CreateOrUpdateDescendantLayer}; use compositor_task::{GetGraphicsMetadata, CreateOrUpdateRootLayer, CreateOrUpdateDescendantLayer};
use compositor_task::{Exit, ChangeReadyState, LoadComplete, Paint, ScrollFragmentPoint, SetIds}; use compositor_task::{Exit, ChangeReadyState, LoadComplete, Paint, ScrollFragmentPoint, SetIds};
use compositor_task::{SetLayerOrigin, ShutdownComplete, ChangeRenderState, RenderMsgDiscarded}; use compositor_task::{SetLayerOrigin, ShutdownComplete, ChangePaintState, PaintMsgDiscarded};
use compositor_task::{CompositorEventListener, CompositorReceiver, ScrollTimeout, FrameTreeUpdateMsg}; use compositor_task::{CompositorEventListener, CompositorReceiver, ScrollTimeout, FrameTreeUpdateMsg};
use windowing::WindowEvent; use windowing::WindowEvent;
@ -103,8 +103,8 @@ impl CompositorEventListener for NullCompositor {
CreateOrUpdateRootLayer(..) | CreateOrUpdateRootLayer(..) |
CreateOrUpdateDescendantLayer(..) | CreateOrUpdateDescendantLayer(..) |
SetLayerOrigin(..) | Paint(..) | SetLayerOrigin(..) | Paint(..) |
ChangeReadyState(..) | ChangeRenderState(..) | ScrollFragmentPoint(..) | ChangeReadyState(..) | ChangePaintState(..) | ScrollFragmentPoint(..) |
LoadComplete | RenderMsgDiscarded(..) | ScrollTimeout(..) => () LoadComplete | PaintMsgDiscarded(..) | ScrollTimeout(..) => ()
} }
true true
} }