diff options
-rw-r--r-- | components/compositing/compositor.rs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index 74e0857de2d..4282b1a5c1f 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -32,7 +32,6 @@ use std::fs::{File, create_dir_all}; use std::io::Write; use std::num::NonZeroU32; use std::rc::Rc; -use std::time::Instant; use style_traits::{CSSPixel, DevicePixel, PinchZoomFactor}; use style_traits::cursor::CursorKind; use style_traits::viewport::ViewportConstraints; @@ -166,8 +165,6 @@ pub struct IOCompositor<Window: WindowMethods> { /// image for the reftest framework. ready_to_save_state: ReadyState, - in_scroll_transaction: Option<Instant>, - /// The webrender renderer. webrender: webrender::Renderer, @@ -320,7 +317,6 @@ impl<Window: WindowMethods> IOCompositor<Window> { time_profiler_chan: state.time_profiler_chan, last_composite_time: 0, ready_to_save_state: ReadyState::Unknown, - in_scroll_transaction: None, webrender: state.webrender, webrender_document: state.webrender_document, webrender_api: state.webrender_api, @@ -843,7 +839,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { &mut self, delta: ScrollLocation, cursor: DeviceIntPoint, - phase: TouchEventType, + phase: TouchEventType ) { match phase { TouchEventType::Move => self.on_scroll_window_event(delta, cursor), @@ -856,8 +852,11 @@ impl<Window: WindowMethods> IOCompositor<Window> { } } - fn on_scroll_window_event(&mut self, scroll_location: ScrollLocation, cursor: DeviceIntPoint) { - self.in_scroll_transaction = Some(Instant::now()); + fn on_scroll_window_event( + &mut self, + scroll_location: ScrollLocation, + cursor: DeviceIntPoint + ) { self.pending_scroll_zoom_events.push(ScrollZoomEvent { magnification: 1.0, scroll_location: scroll_location, |