[Qt] Tap highlight still showing when tap gesture has timed out

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

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

Disable highlight of potential tap, when tap-and-hold state
replaces potential tap state.

* UIProcess/qt/QtTapGestureRecognizer.cpp:
(WebKit::QtTapGestureRecognizer::tapAndHoldTimeout):

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

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index d0851ff..f7c945e 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+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
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Disable highlight of potential tap, when tap-and-hold state
+        replaces potential tap state.
+
+        * UIProcess/qt/QtTapGestureRecognizer.cpp:
+        (WebKit::QtTapGestureRecognizer::tapAndHoldTimeout):
+
 2012-04-02  Zalan Bujtas  <zbujtas@gmail.com>
 
         [Qt][WK2] Set viewport size back, when WebProcess is relaunched.

diff --git a/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp b/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp
index 7032220..9d3a0d6 100644 (file)
--- a/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp
+++ b/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp
@@ -131,6 +131,7 @@ void QtTapGestureRecognizer::tapAndHoldTimeout()
 {
     ASSERT(m_touchBeginEventForTap);
     m_tapAndHoldTimer.stop();
+    m_eventHandler->handlePotentialSingleTapEvent(QTouchEvent::TouchPoint());
 #if 0 // No support for synthetic context menus in WK2 yet.
     QTouchEvent::TouchPoint tapPoint = m_touchBeginEventForTap->touchPoints().at(0);
     WebGestureEvent gesture(WebEvent::GestureTapAndHold, tapPoint.pos().toPoint(), tapPoint.screenPos().toPoint(), WebEvent::Modifiers(0), 0);