From 339c9349a8bcd6242574fba8b557729b2b29ff79 Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Fri, 19 Sep 2014 14:44:00 +0200
Subject: Bring back the mapping of touch IDs to fix flinging

This logic was removed in 3a30ed4ecc9c828641daef85f88f93baf78826b6
but was still needed by the velocity tracker used for fling gestures.

Also disable swipe gestures in the gesture config since they have
unwanted side-effects on the gesture detection and we don't use them.

Change-Id: Icbb44a4c27e2cd243d631484d03a956e9dce64dc
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
 src/core/render_widget_host_view_qt.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/core/render_widget_host_view_qt.h')

diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h
index 301ff2df9..d4a3ff248 100644
--- a/src/core/render_widget_host_view_qt.h
+++ b/src/core/render_widget_host_view_qt.h
@@ -45,6 +45,7 @@
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "ui/events/gesture_detection/filtered_gesture_provider.h"
+#include <QMap>
 #include <QPoint>
 #include <QRect>
 #include <QtGlobal>
@@ -221,6 +222,7 @@ public:
 private:
     void sendDelegatedFrameAck();
     void processMotionEvent(const ui::MotionEvent &motionEvent);
+    QList<QTouchEvent::TouchPoint> mapTouchPointIds(const QList<QTouchEvent::TouchPoint> &inputPoints);
     float dpiScale() const;
 
     bool IsPopup() const;
@@ -230,6 +232,7 @@ private:
     ui::FilteredGestureProvider m_gestureProvider;
     base::TimeDelta m_eventsToNowDelta;
     bool m_sendMotionActionDown;
+    QMap<int, int> m_touchIdMapping;
     scoped_ptr<RenderWidgetHostViewQtDelegate> m_delegate;
 
     QExplicitlySharedDataPointer<DelegatedFrameNodeData> m_frameNodeData;
-- 
cgit v1.2.3