Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Id1a1f4ca84697ba18e2604090e3154295fe1858b

1 files changed, 5 insertions, 1 deletions

diff --git a/src/core/render_widget_host_view_qt_delegate_client.h b/src/core/render_widget_host_view_qt_delegate_client.h
index c338df95e..4ba5da227 100644
--- a/src/core/render_widget_host_view_qt_delegate_client.h
+++ b/src/core/render_widget_host_view_qt_delegate_client.h
@@ -140,9 +140,13 @@ private:
     std::string m_editCommand;
 
     // Touch
-    QList<QTouchEvent::TouchPoint> m_previousTouchPoints;
+    typedef QPair<int, QTouchEvent::TouchPoint> TouchPoint;
+    QList<TouchPoint> mapTouchPointIds(const QList<QTouchEvent::TouchPoint> &input);
+    QMap<int, int> m_touchIdMapping;
+    QList<TouchPoint> m_previousTouchPoints;
     bool m_touchMotionStarted = false;
     bool m_sendMotionActionDown = false;
+    int64_t m_eventsToNowDelta = 0; // delta for first touch in microseconds
 
     // IME
     bool m_receivedEmptyImeEvent = false;