Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove no-op viewport code

Browse source
This commit is contained in:
Paul Rouget 2017-05-29 09:47:57 +02:00
parent 764da7ba39
commit b0afc2694c
2 changed files with 0 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/compositing/compositor.rs
View file

@ -120,9 +120,6 @@ pub struct IOCompositor<Window: WindowMethods> {
/// The position and size of the window within the rendering area. /// The position and size of the window within the rendering area.
window_rect: TypedRect<u32, DevicePixel>, window_rect: TypedRect<u32, DevicePixel>,
/// The overridden viewport.
viewport: Option<(TypedPoint2D<u32, DevicePixel>, TypedSize2D<u32, DevicePixel>)>,
/// "Mobile-style" zoom that does not reflow the page. /// "Mobile-style" zoom that does not reflow the page.
viewport_zoom: PinchZoomFactor, viewport_zoom: PinchZoomFactor,
@ -373,7 +370,6 @@ impl<Window: WindowMethods> IOCompositor<Window> {
frame_size: frame_size, frame_size: frame_size,
window_rect: window_rect, window_rect: window_rect,
scale: ScaleFactor::new(1.0), scale: ScaleFactor::new(1.0),
viewport: None,
scale_factor: scale_factor, scale_factor: scale_factor,
channel_to_self: state.sender.clone_compositor_proxy(), channel_to_self: state.sender.clone_compositor_proxy(),
delayed_composition_timer: DelayedCompositionTimerProxy::new(state.sender), delayed_composition_timer: DelayedCompositionTimerProxy::new(state.sender),
@ -793,10 +789,6 @@ impl<Window: WindowMethods> IOCompositor<Window> {
self.initialize_compositing(); self.initialize_compositing();
} }
WindowEvent::Viewport(point, size) => {
self.viewport = Some((point, size));
}
WindowEvent::Resize(size) => { WindowEvent::Resize(size) => {
self.on_resize_window_event(size); self.on_resize_window_event(size);
} }

3
components/compositing/windowing.rs
View file

@ -54,8 +54,6 @@ pub enum WindowEvent {
Resize(TypedSize2D<u32, DevicePixel>), Resize(TypedSize2D<u32, DevicePixel>),
/// Touchpad Pressure /// Touchpad Pressure
TouchpadPressure(TypedPoint2D<f32, DevicePixel>, f32, TouchpadPressurePhase), TouchpadPressure(TypedPoint2D<f32, DevicePixel>, f32, TouchpadPressurePhase),
/// Sent when you want to override the viewport.
Viewport(TypedPoint2D<u32, DevicePixel>, TypedSize2D<u32, DevicePixel>),
/// Sent when a new URL is to be loaded. /// Sent when a new URL is to be loaded.
LoadUrl(String), LoadUrl(String),
/// Sent when a mouse hit test is to be performed. /// Sent when a mouse hit test is to be performed.
@ -91,7 +89,6 @@ impl Debug for WindowEvent {
WindowEvent::InitializeCompositing => write!(f, "InitializeCompositing"), WindowEvent::InitializeCompositing => write!(f, "InitializeCompositing"),
WindowEvent::Resize(..) => write!(f, "Resize"), WindowEvent::Resize(..) => write!(f, "Resize"),
WindowEvent::TouchpadPressure(..) => write!(f, "TouchpadPressure"), WindowEvent::TouchpadPressure(..) => write!(f, "TouchpadPressure"),
WindowEvent::Viewport(..) => write!(f, "Viewport"),
WindowEvent::KeyEvent(..) => write!(f, "Key"), WindowEvent::KeyEvent(..) => write!(f, "Key"),
WindowEvent::LoadUrl(..) => write!(f, "LoadUrl"), WindowEvent::LoadUrl(..) => write!(f, "LoadUrl"),
WindowEvent::MouseWindowEventClass(..) => write!(f, "Mouse"), WindowEvent::MouseWindowEventClass(..) => write!(f, "Mouse"),