diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-31 14:37:56 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-22 08:47:28 +0000 |
| commit | 75fcb640fae72446b26d7978a5df3c058e0ab67f (patch) | |
| tree | 3467a5d3eb1f31337b81ab8976a07cac0e694541 /src/core/render_widget_host_view_qt.h | |
| parent | 06e3d201299ab803f4dc41f35201830c74242d19 (diff) | |
Adapt to forced scroll-wheel latching
Handle that Chromium now requires all wheel events to be phases despite
them not being phased on the majority of platforms.
Change-Id: Iabd5630652c0d8fd67563db3d63ef1f2f528c35c
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/render_widget_host_view_qt.h')
| -rw-r--r-- | src/core/render_widget_host_view_qt.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h index 26fd16631..92cc422a8 100644 --- a/src/core/render_widget_host_view_qt.h +++ b/src/core/render_widget_host_view_qt.h @@ -46,6 +46,7 @@ #include "components/viz/common/frame_sinks/begin_frame_source.h" #include "components/viz/common/resources/transferable_resource.h" #include "content/browser/accessibility/browser_accessibility_manager.h" +#include "content/browser/renderer_host/input/mouse_wheel_phase_handler.h" #include "content/browser/renderer_host/render_widget_host_view_base.h" #include "content/browser/renderer_host/text_input_manager.h" #include "content/common/view_messages.h" @@ -141,6 +142,7 @@ public: void DidCreateNewRendererCompositorFrameSink(viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink) override; void SubmitCompositorFrame(const viz::LocalSurfaceId&, viz::CompositorFrame, base::Optional<viz::HitTestRegionList>) override; void WheelEventAck(const blink::WebMouseWheelEvent &event, content::InputEventAckState ack_result) override; + content::MouseWheelPhaseHandler *GetMouseWheelPhaseHandler() override; void GetScreenInfo(content::ScreenInfo* results) const override; gfx::Rect GetBoundsInRootWindow() override; @@ -255,6 +257,7 @@ private: bool m_wheelAckPending; QList<blink::WebMouseWheelEvent> m_pendingWheelEvents; + content::MouseWheelPhaseHandler m_mouseWheelPhaseHandler; std::string m_editCommand; }; |