diff options
Diffstat (limited to 'components/compositing')
| -rw-r--r-- | components/compositing/compositor.rs | 12 | ||||
| -rw-r--r-- | components/compositing/compositor_layer.rs | 4 | ||||
| -rw-r--r-- | components/compositing/constellation.rs | 14 | ||||
| -rw-r--r-- | components/compositing/headless.rs | 2 |
4 files changed, 18 insertions, 14 deletions
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index 23bfe1fb536..ba8dfc3bb2c 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -208,8 +208,8 @@ impl<Window: WindowMethods> IOCompositor<Window> { composition_request: CompositionRequest::NoCompositingNecessary, pending_scroll_events: Vec::new(), shutdown_state: ShutdownState::NotShuttingDown, - page_zoom: ScaleFactor(1.0), - viewport_zoom: ScaleFactor(1.0), + page_zoom: ScaleFactor::new(1.0), + viewport_zoom: ScaleFactor::new(1.0), zoom_action: false, zoom_time: 0f64, got_load_complete_message: false, @@ -893,7 +893,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { match opts::get().device_pixels_per_px { Some(device_pixels_per_px) => device_pixels_per_px, None => match opts::get().output_file { - Some(_) => ScaleFactor(1.0), + Some(_) => ScaleFactor::new(1.0), None => self.hidpi_factor } } @@ -905,7 +905,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { fn update_zoom_transform(&mut self) { let scale = self.device_pixels_per_page_px(); - self.scene.scale = ScaleFactor(scale.get()); + self.scene.scale = ScaleFactor::new(scale.get()); // We need to set the size of the root layer again, since the window size // has changed in unscaled layer pixels. @@ -913,7 +913,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { } fn on_zoom_window_event(&mut self, magnification: f32) { - self.page_zoom = ScaleFactor((self.page_zoom.get() * magnification).max(1.0)); + self.page_zoom = ScaleFactor::new((self.page_zoom.get() * magnification).max(1.0)); self.update_zoom_transform(); self.send_window_size(); } @@ -924,7 +924,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { self.zoom_time = precise_time_s(); let old_viewport_zoom = self.viewport_zoom; - self.viewport_zoom = ScaleFactor((self.viewport_zoom.get() * magnification).max(1.0)); + self.viewport_zoom = ScaleFactor::new((self.viewport_zoom.get() * magnification).max(1.0)); let viewport_zoom = self.viewport_zoom; self.update_zoom_transform(); diff --git a/components/compositing/compositor_layer.rs b/components/compositing/compositor_layer.rs index 2f5a9059423..33cec1761c5 100644 --- a/components/compositing/compositor_layer.rs +++ b/components/compositing/compositor_layer.rs @@ -307,8 +307,8 @@ impl CompositorLayer for Layer<CompositorData> { let min_x = (layer_size.width - content_size.width).get().min(0.0); let min_y = (layer_size.height - content_size.height).get().min(0.0); let new_offset : TypedPoint2D<LayerPixel, f32> = - Point2D(Length(new_offset.x.get().clamp(&min_x, &0.0)), - Length(new_offset.y.get().clamp(&min_y, &0.0))); + Point2D(Length::new(new_offset.x.get().clamp(&min_x, &0.0)), + Length::new(new_offset.y.get().clamp(&min_y, &0.0))); if self.extra_data.borrow().scroll_offset == new_offset { return ScrollEventResult::ScrollPositionUnchanged; diff --git a/components/compositing/constellation.rs b/components/compositing/constellation.rs index 58057c94eb1..f5171e817cf 100644 --- a/components/compositing/constellation.rs +++ b/components/compositing/constellation.rs @@ -34,6 +34,7 @@ use util::time::TimeProfilerChan; use std::borrow::ToOwned; use std::collections::{HashMap}; use std::old_io as io; +use std::marker::PhantomData; use std::mem::replace; use std::sync::mpsc::{Receiver, channel}; use url::Url; @@ -95,6 +96,8 @@ pub struct Constellation<LTF, STF> { /// A channel through which messages can be sent to the memory profiler. pub memory_profiler_chan: MemoryProfilerChan, + phantom: PhantomData<(LTF, STF)>, + pub window_size: WindowSizeData, } @@ -201,10 +204,11 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> { time_profiler_chan: time_profiler_chan, memory_profiler_chan: memory_profiler_chan, window_size: WindowSizeData { - visible_viewport: opts::get().initial_window_size.as_f32() * ScaleFactor(1.0), - initial_viewport: opts::get().initial_window_size.as_f32() * ScaleFactor(1.0), - device_pixel_ratio: ScaleFactor(1.0), + visible_viewport: opts::get().initial_window_size.as_f32() * ScaleFactor::new(1.0), + initial_viewport: opts::get().initial_window_size.as_f32() * ScaleFactor::new(1.0), + device_pixel_ratio: ScaleFactor::new(1.0), }, + phantom: PhantomData, }; constellation.run(); }); @@ -227,7 +231,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> { self.pipeline(pipeline_id).rect.map(|rect| { WindowSizeData { visible_viewport: rect.size, - initial_viewport: rect.size * ScaleFactor(1.0), + initial_viewport: rect.size * ScaleFactor::new(1.0), device_pixel_ratio: self.window_size.device_pixel_ratio, } }) @@ -448,7 +452,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> { let ScriptControlChan(ref script_chan) = script_chan; script_chan.send(ConstellationControlMsg::Resize(pipeline_id, WindowSizeData { visible_viewport: rect.size, - initial_viewport: rect.size * ScaleFactor(1.0), + initial_viewport: rect.size * ScaleFactor::new(1.0), device_pixel_ratio: self.window_size.device_pixel_ratio, })).unwrap(); diff --git a/components/compositing/headless.rs b/components/compositing/headless.rs index d25fc4f59e1..18cf76961a7 100644 --- a/components/compositing/headless.rs +++ b/components/compositing/headless.rs @@ -59,7 +59,7 @@ impl NullCompositor { chan.send(ConstellationMsg::ResizedWindow(WindowSizeData { initial_viewport: TypedSize2D(640_f32, 480_f32), visible_viewport: TypedSize2D(640_f32, 480_f32), - device_pixel_ratio: ScaleFactor(1.0), + device_pixel_ratio: ScaleFactor::new(1.0), })).unwrap(); } |