mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Rename compositor_task::Msg.
This commit is contained in:
parent
79722bdc03
commit
94071f6330
3 changed files with 13 additions and 13 deletions
|
@ -4,11 +4,11 @@
|
|||
|
||||
use compositor_layer::{CompositorData, CompositorLayer, DoesntWantScrollEvents};
|
||||
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::{CreateOrUpdateDescendantLayer, CreateOrUpdateRootLayer, Exit};
|
||||
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 constellation::{SendableFrameTree, FrameTreeDiff};
|
||||
use pipeline::CompositionPipeline;
|
||||
|
@ -258,11 +258,11 @@ impl<Window: WindowMethods> IOCompositor<Window> {
|
|||
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);
|
||||
}
|
||||
|
||||
(RenderMsgDiscarded, NotShuttingDown) => {
|
||||
(PaintMsgDiscarded, NotShuttingDown) => {
|
||||
self.remove_outstanding_render_msg();
|
||||
}
|
||||
|
||||
|
|
|
@ -143,11 +143,11 @@ impl RenderListener for Box<CompositorProxy+'static+Send> {
|
|||
}
|
||||
|
||||
fn render_msg_discarded(&mut self) {
|
||||
self.send(RenderMsgDiscarded);
|
||||
self.send(PaintMsgDiscarded);
|
||||
}
|
||||
|
||||
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.
|
||||
ChangeReadyState(PipelineId, ReadyState),
|
||||
/// Alerts the compositor to the current status of rendering.
|
||||
ChangeRenderState(PipelineId, RenderState),
|
||||
ChangePaintState(PipelineId, RenderState),
|
||||
/// 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
|
||||
SetIds(SendableFrameTree, Sender<()>, ConstellationChan),
|
||||
/// Sends an updated version of the frame tree.
|
||||
|
@ -209,8 +209,8 @@ impl Show for Msg {
|
|||
ScrollFragmentPoint(..) => write!(f, "ScrollFragmentPoint"),
|
||||
Paint(..) => write!(f, "Paint"),
|
||||
ChangeReadyState(..) => write!(f, "ChangeReadyState"),
|
||||
ChangeRenderState(..) => write!(f, "ChangeRenderState"),
|
||||
RenderMsgDiscarded(..) => write!(f, "RenderMsgDiscarded"),
|
||||
ChangePaintState(..) => write!(f, "ChangePaintState"),
|
||||
PaintMsgDiscarded(..) => write!(f, "PaintMsgDiscarded"),
|
||||
SetIds(..) => write!(f, "SetIds"),
|
||||
FrameTreeUpdateMsg(..) => write!(f, "FrameTreeUpdateMsg"),
|
||||
LoadComplete => write!(f, "LoadComplete"),
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
use compositor_task::{GetGraphicsMetadata, CreateOrUpdateRootLayer, CreateOrUpdateDescendantLayer};
|
||||
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 windowing::WindowEvent;
|
||||
|
||||
|
@ -103,8 +103,8 @@ impl CompositorEventListener for NullCompositor {
|
|||
CreateOrUpdateRootLayer(..) |
|
||||
CreateOrUpdateDescendantLayer(..) |
|
||||
SetLayerOrigin(..) | Paint(..) |
|
||||
ChangeReadyState(..) | ChangeRenderState(..) | ScrollFragmentPoint(..) |
|
||||
LoadComplete | RenderMsgDiscarded(..) | ScrollTimeout(..) => ()
|
||||
ChangeReadyState(..) | ChangePaintState(..) | ScrollFragmentPoint(..) |
|
||||
LoadComplete | PaintMsgDiscarded(..) | ScrollTimeout(..) => ()
|
||||
}
|
||||
true
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue