Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove no-op viewport code #17074

Merged
merged 1 commit into from May 29, 2017
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

remove no-op viewport code

  • Loading branch information
paulrouget committed May 29, 2017
commit b0afc2694cea877bf0c7d59db53198349d4fd8cd
@@ -120,9 +120,6 @@ pub struct IOCompositor<Window: WindowMethods> {
/// The position and size of the window within the rendering area.
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.
viewport_zoom: PinchZoomFactor,

@@ -373,7 +370,6 @@ impl<Window: WindowMethods> IOCompositor<Window> {
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<Window: WindowMethods> IOCompositor<Window> {
self.initialize_compositing();
}

WindowEvent::Viewport(point, size) => {
self.viewport = Some((point, size));
}

WindowEvent::Resize(size) => {
self.on_resize_window_event(size);
}
@@ -54,8 +54,6 @@ pub enum WindowEvent {
Resize(TypedSize2D<u32, DevicePixel>),
/// Touchpad Pressure
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.
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"),
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.