Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-23 00:24:35 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename IOCompositor's members.

Browse source
This commit is contained in:
Tetsuharu OHZEKI 2014-12-08 13:37:08 +09:00
parent 806b6f09c9
commit 189f40f6f8
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
components/compositing/compositor.rs
View file

@ -97,7 +97,7 @@ pub struct IOCompositor<Window: WindowMethods> {
/// the compositor. /// the compositor.
shutdown_state: ShutdownState, shutdown_state: ShutdownState,
/// Tracks outstanding render_msg's sent to the render tasks. /// Tracks outstanding render_msg's sent to the paint tasks.
outstanding_render_msgs: uint, outstanding_render_msgs: uint,
/// Tracks the last composite time. /// Tracks the last composite time.
@ -113,7 +113,7 @@ pub struct IOCompositor<Window: WindowMethods> {
ready_states: HashMap<PipelineId, ReadyState>, ready_states: HashMap<PipelineId, ReadyState>,
/// Current paint status of each pipeline. /// Current paint status of each pipeline.
render_states: HashMap<PipelineId, PaintState>, paint_states: HashMap<PipelineId, PaintState>,
/// Whether the page being rendered has loaded completely. /// Whether the page being rendered has loaded completely.
/// Differs from ReadyState because we can finish loading (ready) /// Differs from ReadyState because we can finish loading (ready)
@ -200,7 +200,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
zoom_action: false, zoom_action: false,
zoom_time: 0f64, zoom_time: 0f64,
ready_states: HashMap::new(), ready_states: HashMap::new(),
render_states: HashMap::new(), paint_states: HashMap::new(),
got_load_complete_message: false, got_load_complete_message: false,
got_set_ids_message: false, got_set_ids_message: false,
constellation_chan: constellation_chan, constellation_chan: constellation_chan,
@ -258,8 +258,8 @@ impl<Window: WindowMethods> IOCompositor<Window> {
self.change_ready_state(pipeline_id, ready_state); self.change_ready_state(pipeline_id, ready_state);
} }
(ChangePaintState(pipeline_id, render_state), NotShuttingDown) => { (ChangePaintState(pipeline_id, paint_state), NotShuttingDown) => {
self.change_render_state(pipeline_id, render_state); self.change_paint_state(pipeline_id, paint_state);
} }
(PaintMsgDiscarded, NotShuttingDown) => { (PaintMsgDiscarded, NotShuttingDown) => {
@ -358,24 +358,24 @@ impl<Window: WindowMethods> IOCompositor<Window> {
} }
fn change_render_state(&mut self, pipeline_id: PipelineId, render_state: PaintState) { fn change_paint_state(&mut self, pipeline_id: PipelineId, paint_state: PaintState) {
match self.render_states.entry(pipeline_id) { match self.paint_states.entry(pipeline_id) {
Occupied(entry) => { Occupied(entry) => {
*entry.into_mut() = render_state; *entry.into_mut() = paint_state;
} }
Vacant(entry) => { Vacant(entry) => {
entry.set(render_state); entry.set(paint_state);
} }
} }
self.window.set_render_state(render_state); self.window.set_render_state(paint_state);
} }
fn all_pipelines_in_idle_render_state(&self) -> bool { fn all_pipelines_in_idle_paint_state(&self) -> bool {
if self.ready_states.len() == 0 { if self.ready_states.len() == 0 {
return false; return false;
} }
return self.render_states.values().all(|&value| value == IdlePaintState); return self.paint_states.values().all(|&value| value == IdlePaintState);
} }
fn has_render_msg_tracking(&self) -> bool { fn has_render_msg_tracking(&self) -> bool {
@ -437,7 +437,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
-> Rc<Layer<CompositorData>> { -> Rc<Layer<CompositorData>> {
// Initialize the ReadyState and PaintState for this pipeline. // Initialize the ReadyState and PaintState for this pipeline.
self.ready_states.insert(frame_tree.pipeline.id, Blank); self.ready_states.insert(frame_tree.pipeline.id, Blank);
self.render_states.insert(frame_tree.pipeline.id, PaintingPaintState); self.paint_states.insert(frame_tree.pipeline.id, PaintingPaintState);
let root_layer = create_root_layer_for_pipeline_and_rect(&frame_tree.pipeline, frame_rect); let root_layer = create_root_layer_for_pipeline_and_rect(&frame_tree.pipeline, frame_rect);
for kid in frame_tree.children.iter() { for kid in frame_tree.children.iter() {
@ -948,7 +948,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
return false; return false;
} }
if !self.all_pipelines_in_idle_render_state() { if !self.all_pipelines_in_idle_paint_state() {
return false; return false;
} }