Title: [115723] trunk/Source/WebKit2
- Revision
- 115723
- Author
- kenn...@webkit.org
- Date
- 2012-05-01 07:53:59 -0700 (Tue, 01 May 2012)
Log Message
[Qt] Stop repeating timers which should only fire once
https://bugs.webkit.org/show_bug.cgi?id=85277
Reviewed by Antonio Gomes.
The TapGestureRecognizer uses QBasicTimers which are
repeating timers, so stop then when they fire.
* UIProcess/qt/QtTapGestureRecognizer.cpp:
(WebKit::QtTapGestureRecognizer::highlightTimeout):
(WebKit::QtTapGestureRecognizer::singleTapTimeout):
(WebKit::QtTapGestureRecognizer::tapAndHoldTimeout):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (115722 => 115723)
--- trunk/Source/WebKit2/ChangeLog 2012-05-01 14:20:44 UTC (rev 115722)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-01 14:53:59 UTC (rev 115723)
@@ -1,3 +1,18 @@
+2012-05-01 Kenneth Rohde Christiansen <kenn...@webkit.org>
+
+ [Qt] Stop repeating timers which should only fire once
+ https://bugs.webkit.org/show_bug.cgi?id=85277
+
+ Reviewed by Antonio Gomes.
+
+ The TapGestureRecognizer uses QBasicTimers which are
+ repeating timers, so stop then when they fire.
+
+ * UIProcess/qt/QtTapGestureRecognizer.cpp:
+ (WebKit::QtTapGestureRecognizer::highlightTimeout):
+ (WebKit::QtTapGestureRecognizer::singleTapTimeout):
+ (WebKit::QtTapGestureRecognizer::tapAndHoldTimeout):
+
2012-04-30 Anders Carlsson <ander...@apple.com>
Crash when opening plug-ins in background tabs
Modified: trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp (115722 => 115723)
--- trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp 2012-05-01 14:20:44 UTC (rev 115722)
+++ trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp 2012-05-01 14:53:59 UTC (rev 115723)
@@ -101,6 +101,8 @@
void QtTapGestureRecognizer::highlightTimeout()
{
+ m_highlightTimer.stop();
+
if (m_candidate != SingleTapCandidate)
return;
@@ -110,6 +112,8 @@
void QtTapGestureRecognizer::singleTapTimeout()
{
+ m_doubleTapTimer.stop();
+
// Finger is still pressed, ignore.
if (m_tapAndHoldTimer.isActive())
return;
@@ -125,6 +129,8 @@
void QtTapGestureRecognizer::tapAndHoldTimeout()
{
+ m_tapAndHoldTimer.stop();
+
ASSERT(m_lastTouchPoint.id() != -1);
#if 0 // No support for synthetic context menus in WK2 yet.
m_eventHandler->handlePotentialSingleTapEvent(QTouchEvent::TouchPoint());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
