Title: [113012] trunk/Source/WebKit2
Revision
113012
Author
[email protected]
Date
2012-04-03 05:06:20 -0700 (Tue, 03 Apr 2012)

Log Message

[Qt] Tap highlight attempted hidden several times
https://bugs.webkit.org/show_bug.cgi?id=82903

Patch by Allan Sandfeld Jensen <[email protected]> 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):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (113011 => 113012)


--- trunk/Source/WebKit2/ChangeLog	2012-04-03 12:05:49 UTC (rev 113011)
+++ trunk/Source/WebKit2/ChangeLog	2012-04-03 12:06:20 UTC (rev 113012)
@@ -1,5 +1,19 @@
 2012-04-03  Allan Sandfeld Jensen  <[email protected]>
 
+        [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  <[email protected]>
+
         [Qt] Tap highlight still showing when tap gesture has timed out
         https://bugs.webkit.org/show_bug.cgi?id=82902
 

Modified: trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp (113011 => 113012)


--- trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp	2012-04-03 12:05:49 UTC (rev 113011)
+++ trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp	2012-04-03 12:06:20 UTC (rev 113012)
@@ -86,7 +86,8 @@
         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::reset()
 {
+    if (m_tapState == NoTap)
+        return;
+
     m_eventHandler->handlePotentialSingleTapEvent(QTouchEvent::TouchPoint());
 
     m_tapState = NoTap;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to