diff options
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | components/compositing/Cargo.toml | 1 | ||||
| -rw-r--r-- | components/compositing/compositor.rs | 79 | ||||
| -rw-r--r-- | components/servo/lib.rs | 5 |
4 files changed, 65 insertions, 21 deletions
diff --git a/Cargo.lock b/Cargo.lock index ce4e3ce8b6f..d9c547e5bd0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -635,7 +635,6 @@ dependencies = [ "pixels 0.0.1", "profile_traits 0.0.1", "script_traits 0.0.1", - "servo_config 0.0.1", "servo_geometry 0.0.1", "servo_url 0.0.1", "style_traits 0.0.1", diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml index b373c81700b..cc2fadb2ca1 100644 --- a/components/compositing/Cargo.toml +++ b/components/compositing/Cargo.toml @@ -32,7 +32,6 @@ num-traits = "0.2" pixels = {path = "../pixels", optional = true} profile_traits = {path = "../profile_traits"} script_traits = {path = "../script_traits"} -servo_config = {path = "../config"} servo_geometry = {path = "../geometry"} servo_url = {path = "../url"} style_traits = {path = "../style_traits"} diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index 5f5e32bbd75..f38d55bed8d 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -30,7 +30,6 @@ use script_traits::CompositorEvent::{MouseButtonEvent, MouseMoveEvent, TouchEven use script_traits::{AnimationState, AnimationTickType, ConstellationMsg, LayoutControlMsg}; use script_traits::{MouseButton, MouseEventType, ScrollState, TouchEventType, TouchId}; use script_traits::{UntrustedNodeAddress, WindowSizeData, WindowSizeType}; -use servo_config::opts; use servo_geometry::DeviceIndependentPixel; use std::collections::HashMap; use std::env; @@ -194,6 +193,19 @@ pub struct IOCompositor<Window: WindowMethods + ?Sized> { /// Current mouse cursor. cursor: Cursor, + + output_file: Option<String>, + + is_running_problem_test: bool, + + /// True to exit after page load ('-x'). + exit_after_load: bool, + + /// True to translate mouse input into touch events. + convert_mouse_to_touch: bool, + + /// Ratio of device pixels per px at the default scale. + device_pixels_per_px: Option<f32>, } #[derive(Clone, Copy)] @@ -259,8 +271,16 @@ enum CompositeTarget { } impl<Window: WindowMethods + ?Sized> IOCompositor<Window> { - fn new(window: Rc<Window>, state: InitialCompositorState) -> Self { - let composite_target = match opts::get().output_file { + fn new( + window: Rc<Window>, + state: InitialCompositorState, + output_file: Option<String>, + is_running_problem_test: bool, + exit_after_load: bool, + convert_mouse_to_touch: bool, + device_pixels_per_px: Option<f32>, + ) -> Self { + let composite_target = match output_file { Some(_) => CompositeTarget::PngFile, None => CompositeTarget::Window, }; @@ -295,11 +315,32 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> { webvr_heartbeats: state.webvr_heartbeats, pending_paint_metrics: HashMap::new(), cursor: Cursor::None, + output_file, + is_running_problem_test, + exit_after_load, + convert_mouse_to_touch, + device_pixels_per_px, } } - pub fn create(window: Rc<Window>, state: InitialCompositorState) -> Self { - let mut compositor = IOCompositor::new(window, state); + pub fn create( + window: Rc<Window>, + state: InitialCompositorState, + output_file: Option<String>, + is_running_problem_test: bool, + exit_after_load: bool, + convert_mouse_to_touch: bool, + device_pixels_per_px: Option<f32>, + ) -> Self { + let mut compositor = IOCompositor::new( + window, + state, + output_file, + is_running_problem_test, + exit_after_load, + convert_mouse_to_touch, + device_pixels_per_px, + ); // Set the size of the root layer. compositor.update_zoom_transform(); @@ -404,12 +445,12 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> { ); if is_ready { self.ready_to_save_state = ReadyState::ReadyToSaveImage; - if opts::get().is_running_problem_test { + if self.is_running_problem_test { println!("ready to save image!"); } } else { self.ready_to_save_state = ReadyState::Unknown; - if opts::get().is_running_problem_test { + if self.is_running_problem_test { println!("resetting ready_to_save_state!"); } } @@ -449,7 +490,7 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> { (Msg::LoadComplete(_), ShutdownState::NotShuttingDown) => { // If we're painting in headless mode, schedule a recomposite. - if opts::get().output_file.is_some() || opts::get().exit_after_load { + if self.output_file.is_some() || self.exit_after_load { self.composite_if_necessary(CompositingReason::Headless); } }, @@ -625,7 +666,7 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> { } pub fn on_mouse_window_event_class(&mut self, mouse_window_event: MouseWindowEvent) { - if opts::get().convert_mouse_to_touch { + if self.convert_mouse_to_touch { match mouse_window_event { MouseWindowEvent::Click(_, _) => {}, MouseWindowEvent::MouseDown(_, p) => self.on_touch_down(TouchId(0), p), @@ -686,7 +727,7 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> { } pub fn on_mouse_window_move_event_class(&mut self, cursor: DevicePoint) { - if opts::get().convert_mouse_to_touch { + if self.convert_mouse_to_touch { self.on_touch_move(TouchId(0), cursor); return; } @@ -986,9 +1027,9 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> { } fn hidpi_factor(&self) -> TypedScale<f32, DeviceIndependentPixel, DevicePixel> { - match opts::get().device_pixels_per_px { + match self.device_pixels_per_px { Some(device_pixels_per_px) => TypedScale::new(device_pixels_per_px), - None => match opts::get().output_file { + None => match self.output_file { Some(_) => TypedScale::new(1.0), None => self.embedder_coordinates.hidpi_factor, }, @@ -1125,7 +1166,7 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> { // for saving. // Reset the flag so that we check again in the future // TODO: only reset this if we load a new document? - if opts::get().is_running_problem_test { + if self.is_running_problem_test { println!("was ready to save, resetting ready_to_save_state"); } self.ready_to_save_state = ReadyState::Unknown; @@ -1138,13 +1179,13 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> { let target = self.composite_target; match self.composite_specific_target(target) { Ok(_) => { - if opts::get().output_file.is_some() || opts::get().exit_after_load { + if self.output_file.is_some() || self.exit_after_load { println!("Shutting down the Constellation after generating an output file or exit flag specified"); self.start_shutting_down(); } }, Err(e) => { - if opts::get().is_running_problem_test { + if self.is_running_problem_test { if e != UnableToComposite::NotReadyToPaintImage( NotReadyToPaint::WaitingOnConstellation, ) { @@ -1178,7 +1219,7 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> { let wait_for_stable_image = match target { CompositeTarget::WindowAndPng | CompositeTarget::PngFile => true, - CompositeTarget::Window => opts::get().exit_after_load, + CompositeTarget::Window => self.exit_after_load, }; if wait_for_stable_image { @@ -1279,7 +1320,7 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> { ProfilerCategory::ImageSaving, None, self.time_profiler_chan.clone(), - || match opts::get().output_file.as_ref() { + || match self.output_file.as_ref() { Some(path) => match File::create(path) { Ok(mut file) => { let img = gl::draw_img(gl, rt_info, width, height); @@ -1315,11 +1356,11 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> { fn composite_if_necessary(&mut self, reason: CompositingReason) { if self.composition_request == CompositionRequest::NoCompositingNecessary { - if opts::get().is_running_problem_test { + if self.is_running_problem_test { println!("updating composition_request ({:?})", reason); } self.composition_request = CompositionRequest::CompositeNow(reason) - } else if opts::get().is_running_problem_test { + } else if self.is_running_problem_test { println!( "composition_request is already {:?}", self.composition_request diff --git a/components/servo/lib.rs b/components/servo/lib.rs index 088df2ea85f..5d4f0641db7 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -337,6 +337,11 @@ where webrender_api, webvr_heartbeats, }, + opts.output_file.clone(), + opts.is_running_problem_test, + opts.exit_after_load, + opts.convert_mouse_to_touch, + opts.device_pixels_per_px, ); Servo { |