diff options
Diffstat (limited to 'components/compositing/constellation.rs')
| -rw-r--r-- | components/compositing/constellation.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/components/compositing/constellation.rs b/components/compositing/constellation.rs index c8ab30b92aa..dedf6e07b5e 100644 --- a/components/compositing/constellation.rs +++ b/components/compositing/constellation.rs @@ -6,8 +6,7 @@ use pipeline::{Pipeline, CompositionPipeline}; use compositor_task::CompositorProxy; use compositor_task::Msg as CompositorMsg; -use devtools_traits; -use devtools_traits::DevtoolsControlChan; +use devtools_traits::{DevtoolsControlChan, DevtoolsControlMsg}; use geom::rect::{Rect, TypedRect}; use geom::scale_factor::ScaleFactor; use gfx::font_cache_task::FontCacheTask; @@ -36,7 +35,7 @@ use util::time::TimeProfilerChan; use std::borrow::ToOwned; use std::cell::{Cell, RefCell}; use std::collections::{HashMap, HashSet}; -use std::io; +use std::old_io as io; use std::mem::replace; use std::rc::Rc; use std::sync::mpsc::{Receiver, channel}; @@ -521,7 +520,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> { self.image_cache_task.exit(); self.resource_task.send(resource_task::ControlMsg::Exit).unwrap(); self.devtools_chan.as_ref().map(|chan| { - chan.send(devtools_traits::ServerExitMsg).unwrap(); + chan.send(DevtoolsControlMsg::ServerExitMsg).unwrap(); }); self.storage_task.send(StorageTaskMsg::Exit).unwrap(); self.font_cache_task.exit(); @@ -1084,7 +1083,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> { return; // Our message has been discarded, probably shutting down. } - let mut iter = frame_tree.iter(); + let iter = frame_tree.iter(); for frame in iter { frame.has_compositor_layer.set(true); frame.pipeline.borrow().grant_paint_permission(); |