From 1aed7a390e8fd5dadf29348291cd1170ac657b36 Mon Sep 17 00:00:00 2001 From: Daniel Hedlund Date: Sun, 15 Dec 2013 15:52:52 -0800 Subject: [PATCH] Add comments and improve performance of a comparison --- src/components/main/compositing/run.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/main/compositing/run.rs b/src/components/main/compositing/run.rs index b07b44025b7..2da97857ad6 100644 --- a/src/components/main/compositing/run.rs +++ b/src/components/main/compositing/run.rs @@ -50,9 +50,11 @@ pub fn run_compositor(compositor: &CompositorTask) { let mut window_size = Size2D(window_size.width as uint, window_size.height as uint); let mut done = false; let mut recomposite = false; - let mut composite_ready = false; let graphics_context = CompositorTask::create_graphics_context(); + // Tracks whether the renderer is idle and it's now safe to perform a composite + let mut composite_ready = false; + // Keeps track of the current zoom factor let mut world_zoom = 1f32; let mut zoom_action = false; @@ -86,10 +88,7 @@ pub fn run_compositor(compositor: &CompositorTask) { ChangeReadyState(ready_state) => window.set_ready_state(ready_state), ChangeRenderState(render_state) => { window.set_render_state(render_state); - composite_ready = match render_state { - IdleRenderState => true, - _ => false, - } + composite_ready = render_state == IdleRenderState; } SetUnRenderedColor(_id, color) => { @@ -412,6 +411,7 @@ pub fn run_compositor(compositor: &CompositorTask) { // Check for messages coming from the windowing system. check_for_window_messages(window.recv()); + // If asked to recomposite and renderer is in a safe/idle state if recomposite && composite_ready { recomposite = false; composite();