diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index bc27ff37748..9cba12dddee 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -166,9 +166,6 @@ pub struct IOCompositor { /// image for the reftest framework. ready_to_save_state: ReadyState, - /// Whether a scroll is in progress; i.e. whether the user's fingers are down. - scroll_in_progress: bool, - in_scroll_transaction: Option, /// The webrender renderer. @@ -852,10 +849,10 @@ impl IOCompositor { match phase { TouchEventType::Move => self.on_scroll_window_event(delta, cursor), TouchEventType::Up | TouchEventType::Cancel => { - self.on_scroll_end_window_event(delta, cursor); + self.on_scroll_window_event(delta, cursor); }, TouchEventType::Down => { - self.on_scroll_start_window_event(delta, cursor); + self.on_scroll_window_event(delta, cursor); }, } } @@ -870,34 +867,6 @@ impl IOCompositor { }); } - fn on_scroll_start_window_event( - &mut self, - scroll_location: ScrollLocation, - cursor: DeviceIntPoint, - ) { - self.scroll_in_progress = true; - self.pending_scroll_zoom_events.push(ScrollZoomEvent { - magnification: 1.0, - scroll_location: scroll_location, - cursor: cursor, - event_count: 1, - }); - } - - fn on_scroll_end_window_event( - &mut self, - scroll_location: ScrollLocation, - cursor: DeviceIntPoint, - ) { - self.scroll_in_progress = false; - self.pending_scroll_zoom_events.push(ScrollZoomEvent { - magnification: 1.0, - scroll_location: scroll_location, - cursor: cursor, - event_count: 1, - }); - } - fn process_pending_scroll_events(&mut self) { let had_events = self.pending_scroll_zoom_events.len() > 0;