diff options
Diffstat (limited to 'components/compositing/compositor.rs')
| -rw-r--r-- | components/compositing/compositor.rs | 81 |
1 files changed, 43 insertions, 38 deletions
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index d10e0c29703..ceee0b2f869 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -41,11 +41,12 @@ use servo_util::opts; use servo_util::time::{TimeProfilerCategory, profile, TimeProfilerChan}; use servo_util::{memory, time}; use std::collections::HashMap; -use std::collections::hash_map::{Occupied, Vacant}; +use std::collections::hash_map::Entry::{Occupied, Vacant}; use std::path::Path; -use std::num::FloatMath; +use std::num::Float; use std::rc::Rc; use std::slice::bytes::copy_memory; +use std::sync::mpsc::Sender; use time::{precise_time_ns, precise_time_s}; use url::Url; @@ -71,7 +72,7 @@ pub struct IOCompositor<Window: WindowMethods> { scene: Scene<CompositorData>, /// The application window size. - window_size: TypedSize2D<DevicePixel, uint>, + window_size: TypedSize2D<DevicePixel, u32>, /// "Mobile-style" zoom that does not reflow the page. viewport_zoom: ScaleFactor<PagePx, ViewportPx, f32>, @@ -134,14 +135,14 @@ pub struct ScrollEvent { cursor: TypedPoint2D<DevicePixel,i32>, } -#[deriving(PartialEq)] +#[derive(PartialEq)] enum CompositionRequest { NoCompositingNecessary, CompositeOnScrollTimeout(u64), CompositeNow, } -#[deriving(Copy, PartialEq, Show)] +#[derive(Copy, PartialEq, Show)] enum ShutdownState { NotShuttingDown, ShuttingDown, @@ -250,8 +251,8 @@ impl<Window: WindowMethods> IOCompositor<Window> { (Msg::Exit(chan), _) => { debug!("shutting down the constellation"); let ConstellationChan(ref con_chan) = self.constellation_chan; - con_chan.send(ConstellationMsg::Exit); - chan.send(()); + con_chan.send(ConstellationMsg::Exit).unwrap(); + chan.send(()).unwrap(); self.shutdown_state = ShutdownState::ShuttingDown; } @@ -292,13 +293,13 @@ impl<Window: WindowMethods> IOCompositor<Window> { (Msg::ChangeLayerPipelineAndRemoveChildren(old_pipeline, new_pipeline, response_channel), ShutdownState::NotShuttingDown) => { self.handle_change_layer_pipeline_and_remove_children(old_pipeline, new_pipeline); - response_channel.send(()); + response_channel.send(()).unwrap(); } (Msg::CreateRootLayerForPipeline(parent_pipeline, pipeline, rect, response_channel), ShutdownState::NotShuttingDown) => { self.handle_create_root_layer_for_pipeline(parent_pipeline, pipeline, rect); - response_channel.send(()); + response_channel.send(()).unwrap(); } (Msg::CreateOrUpdateBaseLayer(layer_properties), ShutdownState::NotShuttingDown) => { @@ -311,7 +312,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { } (Msg::GetGraphicsMetadata(chan), ShutdownState::NotShuttingDown) => { - chan.send(Some(self.window.native_metadata())); + chan.send(Some(self.window.native_metadata())).unwrap(); } (Msg::SetLayerOrigin(pipeline_id, layer_id, origin), @@ -419,12 +420,12 @@ impl<Window: WindowMethods> IOCompositor<Window> { Some(ref details) => { match details.pipeline { Some(ref pipeline) => pipeline, - None => panic!("Compositor layer has an unitialized pipeline ({}).", + None => panic!("Compositor layer has an unitialized pipeline ({:?}).", pipeline_id), } } - None => panic!("Compositor layer has an unknown pipeline ({}).", pipeline_id), + None => panic!("Compositor layer has an unknown pipeline ({:?}).", pipeline_id), } } @@ -459,7 +460,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { if !self.has_paint_msg_tracking() { return; } - debug!("add_outstanding_paint_msg {}", self.outstanding_paint_msgs); + debug!("add_outstanding_paint_msg {:?}", self.outstanding_paint_msgs); self.outstanding_paint_msgs += count; } @@ -478,7 +479,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { frame_tree: &SendableFrameTree, response_chan: Sender<()>, new_constellation_chan: ConstellationChan) { - response_chan.send(()); + response_chan.send(()).unwrap(); self.root_pipeline = Some(frame_tree.pipeline.clone()); @@ -546,7 +547,8 @@ impl<Window: WindowMethods> IOCompositor<Window> { let root_layer = match self.find_pipeline_root_layer(old_pipeline.id) { Some(root_layer) => root_layer, None => { - debug!("Ignoring ChangeLayerPipelineAndRemoveChildren message for pipeline ({}) shutting down.", + debug!("Ignoring ChangeLayerPipelineAndRemoveChildren message \ + for pipeline ({:?}) shutting down.", old_pipeline.id); return; } @@ -581,7 +583,8 @@ impl<Window: WindowMethods> IOCompositor<Window> { let parent_layer = match self.find_pipeline_root_layer(pipeline_id) { Some(root_layer) => root_layer, None => { - debug!("Ignoring FrameTreeUpdate message for pipeline ({}) shutting down.", + debug!("Ignoring FrameTreeUpdate message for pipeline ({:?}) \ + shutting down.", pipeline_id); return; } @@ -611,7 +614,8 @@ impl<Window: WindowMethods> IOCompositor<Window> { let root_layer = match self.find_pipeline_root_layer(pipeline_id) { Some(root_layer) => root_layer, None => { - debug!("Ignoring CreateOrUpdateBaseLayer message for pipeline ({}) shutting down.", + debug!("Ignoring CreateOrUpdateBaseLayer message for pipeline \ + ({:?}) shutting down.", pipeline_id); return; } @@ -669,7 +673,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { device_pixel_ratio: dppx, initial_viewport: initial_viewport, visible_viewport: visible_viewport, - })); + })).unwrap() } pub fn move_layer(&self, @@ -723,7 +727,8 @@ impl<Window: WindowMethods> IOCompositor<Window> { Some(ref layer) => { layer.bounds.borrow_mut().origin = Point2D::from_untyped(&new_origin) } - None => panic!("Compositor received SetLayerOrigin for nonexistent layer: {}", pipeline_id), + None => panic!("Compositor received SetLayerOrigin for nonexistent \ + layer: {:?}", pipeline_id), }; self.send_buffer_requests_for_all_layers(); @@ -744,14 +749,14 @@ impl<Window: WindowMethods> IOCompositor<Window> { let pipeline = self.get_pipeline(pipeline_id); let message = PaintMsg::UnusedBuffer(new_layer_buffer_set.buffers); - let _ = pipeline.paint_chan.send_opt(message); + let _ = pipeline.paint_chan.send(message); } fn assign_painted_buffers_to_layer(&mut self, layer: Rc<Layer<CompositorData>>, new_layer_buffer_set: Box<LayerBufferSet>, epoch: Epoch) { - debug!("compositor received new frame at size {}x{}", + debug!("compositor received new frame at size {:?}x{:?}", self.window_size.width.get(), self.window_size.height.get()); @@ -829,14 +834,14 @@ impl<Window: WindowMethods> IOCompositor<Window> { WindowEvent::Quit => { debug!("shutting down the constellation for WindowEvent::Quit"); let ConstellationChan(ref chan) = self.constellation_chan; - chan.send(ConstellationMsg::Exit); + chan.send(ConstellationMsg::Exit).unwrap(); self.shutdown_state = ShutdownState::ShuttingDown; } } } - fn on_resize_window_event(&mut self, new_size: TypedSize2D<DevicePixel, uint>) { - debug!("compositor resizing to {}", new_size.to_untyped()); + fn on_resize_window_event(&mut self, new_size: TypedSize2D<DevicePixel, u32>) { + debug!("compositor resizing to {:?}", new_size.to_untyped()); // A size change could also mean a resolution change. let new_hidpi_factor = self.window.hidpi_factor(); @@ -867,7 +872,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { let msg = ConstellationMsg::LoadUrl(root_pipeline_id, LoadData::new(Url::parse(url_string.as_slice()).unwrap())); let ConstellationChan(ref chan) = self.constellation_chan; - chan.send(msg); + chan.send(msg).unwrap() } fn on_mouse_window_event_class(&self, mouse_window_event: MouseWindowEvent) { @@ -986,12 +991,12 @@ impl<Window: WindowMethods> IOCompositor<Window> { windowing::WindowNavigateMsg::Back => NavigationDirection::Back, }; let ConstellationChan(ref chan) = self.constellation_chan; - chan.send(ConstellationMsg::Navigate(direction)) + chan.send(ConstellationMsg::Navigate(direction)).unwrap() } fn on_key_event(&self, key: Key, state: KeyState, modifiers: KeyModifiers) { let ConstellationChan(ref chan) = self.constellation_chan; - chan.send(ConstellationMsg::KeyEvent(key, state, modifiers)) + chan.send(ConstellationMsg::KeyEvent(key, state, modifiers)).unwrap() } fn convert_buffer_requests_to_pipeline_requests_map(&self, @@ -1008,7 +1013,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { entry.into_mut() } Vacant(entry) => { - entry.set(Vec::new()) + entry.insert(Vec::new()) } }; @@ -1035,7 +1040,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { let unused_buffers = self.scene.collect_unused_buffers(); if unused_buffers.len() != 0 { let message = PaintMsg::UnusedBuffer(unused_buffers); - let _ = pipeline.paint_chan.send_opt(message); + let _ = pipeline.paint_chan.send(message); } }, None => {} @@ -1048,7 +1053,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { layer.bounds.borrow().size.to_untyped()); let pipeline = self.get_pipeline(layer.get_pipeline_id()); let ScriptControlChan(ref chan) = pipeline.script_chan; - chan.send(ConstellationControlMsg::Viewport(pipeline.id.clone(), layer_rect)); + chan.send(ConstellationControlMsg::Viewport(pipeline.id.clone(), layer_rect)).unwrap(); } for kid in layer.children().iter() { @@ -1084,7 +1089,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { let mut num_paint_msgs_sent = 0; for (pipeline_id, requests) in pipeline_requests.into_iter() { num_paint_msgs_sent += 1; - let _ = self.get_pipeline(pipeline_id).paint_chan.send_opt(PaintMsg::Paint(requests)); + let _ = self.get_pipeline(pipeline_id).paint_chan.send(PaintMsg::Paint(requests)); } self.add_outstanding_paint_msg(num_paint_msgs_sent); @@ -1125,7 +1130,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { let mut framebuffer_ids = vec!(); let mut texture_ids = vec!(); - let (width, height) = (self.window_size.width.get(), self.window_size.height.get()); + let (width, height) = (self.window_size.width.get() as usize, self.window_size.height.get() as usize); if output_image { framebuffer_ids = gl::gen_framebuffers(1); @@ -1169,8 +1174,8 @@ impl<Window: WindowMethods> IOCompositor<Window> { }); if output_image { - let path = - from_str::<Path>(opts::get().output_file.as_ref().unwrap().as_slice()).unwrap(); + let path: Path = + opts::get().output_file.as_ref().unwrap().as_slice().parse().unwrap(); let mut pixels = gl::read_pixels(0, 0, width as gl::GLsizei, height as gl::GLsizei, @@ -1201,7 +1206,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { debug!("shutting down the constellation after generating an output file"); let ConstellationChan(ref chan) = self.constellation_chan; - chan.send(ConstellationMsg::Exit); + chan.send(ConstellationMsg::Exit).unwrap(); self.shutdown_state = ShutdownState::ShuttingDown; } @@ -1393,10 +1398,10 @@ impl<Window> CompositorEventListener for IOCompositor<Window> where Window: Wind // Tell the profiler, memory profiler, and scrolling timer to shut down. let TimeProfilerChan(ref time_profiler_chan) = self.time_profiler_chan; - time_profiler_chan.send(time::TimeProfilerMsg::Exit); + time_profiler_chan.send(time::TimeProfilerMsg::Exit).unwrap(); let MemoryProfilerChan(ref memory_profiler_chan) = self.memory_profiler_chan; - memory_profiler_chan.send(memory::MemoryProfilerMsg::Exit); + memory_profiler_chan.send(memory::MemoryProfilerMsg::Exit).unwrap(); self.scrolling_timer.shutdown(); } @@ -1411,6 +1416,6 @@ impl<Window> CompositorEventListener for IOCompositor<Window> where Window: Wind Some(ref root_pipeline) => root_pipeline.id, }; let ConstellationChan(ref chan) = self.constellation_chan; - chan.send(ConstellationMsg::GetPipelineTitle(root_pipeline_id)); + chan.send(ConstellationMsg::GetPipelineTitle(root_pipeline_id)).unwrap(); } } |