Title: [129102] trunk
- Revision
- 129102
- Author
- [email protected]
- Date
- 2012-09-20 01:19:32 -0700 (Thu, 20 Sep 2012)
Log Message
[Qt] Add eventSender.gestureTap
https://bugs.webkit.org/show_bug.cgi?id=66173
Patch by Allan Sandfeld Jensen <[email protected]> on 2012-09-20
Reviewed by Kenneth Rohde Christiansen.
Tools:
Implement support for sending raw QGesture events.
* DumpRenderTree/qt/EventSenderQt.cpp:
(EventSender::EventSender):
(EventSender::gestureTap):
* DumpRenderTree/qt/EventSenderQt.h:
(EventSender):
LayoutTests:
Change test to only being skipped in Qt WebKit2.
* platform/qt-5.0-wk2/Skipped:
* platform/qt/Skipped:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (129101 => 129102)
--- trunk/LayoutTests/ChangeLog 2012-09-20 08:14:06 UTC (rev 129101)
+++ trunk/LayoutTests/ChangeLog 2012-09-20 08:19:32 UTC (rev 129102)
@@ -1,3 +1,15 @@
+2012-09-20 Allan Sandfeld Jensen <[email protected]>
+
+ [Qt] Add eventSender.gestureTap
+ https://bugs.webkit.org/show_bug.cgi?id=66173
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Change test to only being skipped in Qt WebKit2.
+
+ * platform/qt-5.0-wk2/Skipped:
+ * platform/qt/Skipped:
+
2012-09-20 Yury Semikhatsky <[email protected]>
Unreviewed. Mark http/tests/css/link-css-disabled-value-with-slow-loading-sheet.html
Modified: trunk/LayoutTests/platform/qt/Skipped (129101 => 129102)
--- trunk/LayoutTests/platform/qt/Skipped 2012-09-20 08:14:06 UTC (rev 129101)
+++ trunk/LayoutTests/platform/qt/Skipped 2012-09-20 08:19:32 UTC (rev 129102)
@@ -2419,9 +2419,6 @@
fast/events/selectstart-by-double-triple-clicks.html
fast/events/selectstart-by-drag.html
-# [Qt] Add eventSender.gestureTap
-# https://bugs.webkit.org/show_bug.cgi?id=66173
-fast/events/touch/gesture/gesture-click.html
# New tests introduced in https://bugs.webkit.org/show_bug.cgi?id=66272. Needs
# Qt implementation.
fast/events/touch/gesture/gesture-dblclick.html
Modified: trunk/LayoutTests/platform/qt-5.0-wk2/Skipped (129101 => 129102)
--- trunk/LayoutTests/platform/qt-5.0-wk2/Skipped 2012-09-20 08:14:06 UTC (rev 129101)
+++ trunk/LayoutTests/platform/qt-5.0-wk2/Skipped 2012-09-20 08:19:32 UTC (rev 129102)
@@ -63,6 +63,8 @@
fast/forms/interactive-validation-attach-assertion.html
fast/forms/legend-access-key.html
fast/loader/policy-delegate-action-hit-test-zoomed.html
+# eventSender.gestureTap
+fast/events/touch/gesture/gesture-click.html
svg/custom/use-events-crash.svg
Modified: trunk/Tools/ChangeLog (129101 => 129102)
--- trunk/Tools/ChangeLog 2012-09-20 08:14:06 UTC (rev 129101)
+++ trunk/Tools/ChangeLog 2012-09-20 08:19:32 UTC (rev 129102)
@@ -1,3 +1,18 @@
+2012-09-20 Allan Sandfeld Jensen <[email protected]>
+
+ [Qt] Add eventSender.gestureTap
+ https://bugs.webkit.org/show_bug.cgi?id=66173
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Implement support for sending raw QGesture events.
+
+ * DumpRenderTree/qt/EventSenderQt.cpp:
+ (EventSender::EventSender):
+ (EventSender::gestureTap):
+ * DumpRenderTree/qt/EventSenderQt.h:
+ (EventSender):
+
2012-09-19 Sheriff Bot <[email protected]>
Unreviewed, rolling out r129007.
Modified: trunk/Tools/DumpRenderTree/qt/EventSenderQt.cpp (129101 => 129102)
--- trunk/Tools/DumpRenderTree/qt/EventSenderQt.cpp 2012-09-20 08:14:06 UTC (rev 129101)
+++ trunk/Tools/DumpRenderTree/qt/EventSenderQt.cpp 2012-09-20 08:19:32 UTC (rev 129102)
@@ -29,6 +29,7 @@
#include "config.h"
#include "EventSenderQt.h"
+#include <QGestureEvent>
#include <QGraphicsSceneMouseEvent>
#include <QtTest/QtTest>
#include <qpa/qwindowsysteminterface.h>
@@ -59,6 +60,9 @@
EventSender::EventSender(QWebPage* parent)
: QObject(parent)
+#ifndef QT_NO_GESTURES
+ , m_tapGesture(parent)
+#endif
{
m_page = parent;
m_mouseButtonPressed = false;
@@ -531,6 +535,17 @@
}
}
+#ifndef QT_NO_GESTURES
+void EventSender::gestureTap(int x, int y)
+{
+ m_tapGesture.setPosition(QPointF(x, y));
+ m_gestures.clear();
+ m_gestures.append(&m_tapGesture);
+ QGestureEvent event(m_gestures);
+ sendEvent(m_page, &event);
+}
+#endif
+
void EventSender::zoomPageIn()
{
if (QWebFrame* frame = m_page->mainFrame())
Modified: trunk/Tools/DumpRenderTree/qt/EventSenderQt.h (129101 => 129102)
--- trunk/Tools/DumpRenderTree/qt/EventSenderQt.h 2012-09-20 08:14:06 UTC (rev 129101)
+++ trunk/Tools/DumpRenderTree/qt/EventSenderQt.h 2012-09-20 08:19:32 UTC (rev 129102)
@@ -36,6 +36,7 @@
#include <QBasicTimer>
#include <QEvent>
#include <QEventLoop>
+#include <QGesture>
#include <QMouseEvent>
#include <QObject>
#include <QPoint>
@@ -83,6 +84,9 @@
void clearTouchPoints();
void releaseTouchPoint(int index);
void cancelTouchPoint(int index);
+#ifndef QT_NO_GESTURES
+ void gestureTap(int x, int y);
+#endif
protected:
void timerEvent(QTimerEvent*);
@@ -112,6 +116,10 @@
QBasicTimer m_clickTimer;
QList<QTouchEvent::TouchPoint> m_touchPoints;
Qt::KeyboardModifiers m_touchModifiers;
+#ifndef QT_NO_GESTURES
+ QTapGesture m_tapGesture;
+ QList<QGesture*> m_gestures;
+#endif
bool m_touchActive;
};
#endif // EventSenderQt_h
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
