From b0afc2694cea877bf0c7d59db53198349d4fd8cd Mon Sep 17 00:00:00 2001 From: Paul Rouget Date: Mon, 29 May 2017 09:47:57 +0200 Subject: [PATCH] remove no-op viewport code --- components/compositing/compositor.rs | 8 -------- components/compositing/windowing.rs | 3 --- 2 files changed, 11 deletions(-) diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index 52c617fb0bd..210fbdbffcd 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -120,9 +120,6 @@ pub struct IOCompositor { /// The position and size of the window within the rendering area. window_rect: TypedRect, - /// The overridden viewport. - viewport: Option<(TypedPoint2D, TypedSize2D)>, - /// "Mobile-style" zoom that does not reflow the page. viewport_zoom: PinchZoomFactor, @@ -373,7 +370,6 @@ impl IOCompositor { frame_size: frame_size, window_rect: window_rect, scale: ScaleFactor::new(1.0), - viewport: None, scale_factor: scale_factor, channel_to_self: state.sender.clone_compositor_proxy(), delayed_composition_timer: DelayedCompositionTimerProxy::new(state.sender), @@ -793,10 +789,6 @@ impl IOCompositor { self.initialize_compositing(); } - WindowEvent::Viewport(point, size) => { - self.viewport = Some((point, size)); - } - WindowEvent::Resize(size) => { self.on_resize_window_event(size); } diff --git a/components/compositing/windowing.rs b/components/compositing/windowing.rs index f3c7e8f1713..b929e47ead1 100644 --- a/components/compositing/windowing.rs +++ b/components/compositing/windowing.rs @@ -54,8 +54,6 @@ pub enum WindowEvent { Resize(TypedSize2D), /// Touchpad Pressure TouchpadPressure(TypedPoint2D, f32, TouchpadPressurePhase), - /// Sent when you want to override the viewport. - Viewport(TypedPoint2D, TypedSize2D), /// Sent when a new URL is to be loaded. LoadUrl(String), /// Sent when a mouse hit test is to be performed. @@ -91,7 +89,6 @@ impl Debug for WindowEvent { WindowEvent::InitializeCompositing => write!(f, "InitializeCompositing"), WindowEvent::Resize(..) => write!(f, "Resize"), WindowEvent::TouchpadPressure(..) => write!(f, "TouchpadPressure"), - WindowEvent::Viewport(..) => write!(f, "Viewport"), WindowEvent::KeyEvent(..) => write!(f, "Key"), WindowEvent::LoadUrl(..) => write!(f, "LoadUrl"), WindowEvent::MouseWindowEventClass(..) => write!(f, "Mouse"),