[Qt] Tap highlight attempted hidden several times

https://bugs.webkit.org/show_bug.cgi?id=82903

Patch by Allan Sandfeld Jensen <allan.jensen@nokia.com> on 2012-04-03
Reviewed by Kenneth Rohde Christiansen.

Do not reset GestureRecognizer if already reset, and do not
disable tap-highlight on touch-end if already reset.

* UIProcess/qt/QtTapGestureRecognizer.cpp:
(WebKit::QtTapGestureRecognizer::recognize):
(WebKit::QtTapGestureRecognizer::reset):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@113012 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index f7c945e..f87f44e 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,19 @@
 2012-04-03  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
 
+        [Qt] Tap highlight attempted hidden several times
+        https://bugs.webkit.org/show_bug.cgi?id=82903
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Do not reset GestureRecognizer if already reset, and do not
+        disable tap-highlight on touch-end if already reset.
+
+        * UIProcess/qt/QtTapGestureRecognizer.cpp:
+        (WebKit::QtTapGestureRecognizer::recognize):
+        (WebKit::QtTapGestureRecognizer::reset):
+
+2012-04-03  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
+
         [Qt] Tap highlight still showing when tap gesture has timed out
         https://bugs.webkit.org/show_bug.cgi?id=82902
 

diff --git a/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp b/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp
index 9d3a0d6..d637366 100644 (file)
--- a/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp
+++ b/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp
@@ -86,7 +86,8 @@ bool QtTapGestureRecognizer::recognize(const QTouchEvent* event, qint64 eventTim
         break;
     case QEvent::TouchEnd:
         m_tapAndHoldTimer.stop();
-        m_eventHandler->handlePotentialSingleTapEvent(QTouchEvent::TouchPoint());
+        if (m_tapState != NoTap)
+            m_eventHandler->handlePotentialSingleTapEvent(QTouchEvent::TouchPoint());
 
         switch (m_tapState) {
         case DoubleTapCandidate:
@@ -147,6 +148,9 @@ void QtTapGestureRecognizer::tapAndHoldTimeout()
 
 void QtTapGestureRecognizer::reset()
 {
+    if (m_tapState == NoTap)
+        return;
+
     m_eventHandler->handlePotentialSingleTapEvent(QTouchEvent::TouchPoint());
 
     m_tapState = NoTap;