diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 10:01:36 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 10:53:06 +0200 |
commit | 7978feadee937299798372bced1680f52b4b1842 (patch) | |
tree | bb844daade8c195c0a963f4663c2a0f880bd840a /src/core/render_widget_host_view_qt.h | |
parent | 56ceccc4d4ff395983c4a2fbbe12fe8cb591cfb5 (diff) | |
parent | 56955e73d4be21bc3f086d1c805352a96944a25c (diff) |
Merge branch '5.6' into 5.7
Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9
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 b59de6c2e..8c9e6b9f3 100644 --- a/src/core/render_widget_host_view_qt.h +++ b/src/core/render_widget_host_view_qt.h @@ -214,6 +214,7 @@ public: private: void sendDelegatedFrameAck(); void processMotionEvent(const ui::MotionEvent &motionEvent); + void clearPreviousTouchMotionState(); QList<QTouchEvent::TouchPoint> mapTouchPointIds(const QList<QTouchEvent::TouchPoint> &inputPoints); float dpiScale() const; @@ -223,7 +224,9 @@ private: ui::FilteredGestureProvider m_gestureProvider; base::TimeDelta m_eventsToNowDelta; bool m_sendMotionActionDown; + bool m_touchMotionStarted; QMap<int, int> m_touchIdMapping; + QList<QTouchEvent::TouchPoint> m_previousTouchPoints; scoped_ptr<RenderWidgetHostViewQtDelegate> m_delegate; QExplicitlySharedDataPointer<ChromiumCompositorData> m_chromiumCompositorData; |