Changeset 49167 in webkit

Timestamp:

Oct 6, 2009 4:42:29 AM (15 years ago)

Author:

eric@webkit.org

Message:

2009-10-06 Jakub Wieczorek <​faw217@gmail.com>

Reviewed by Simon Hausmann.

[Qt] The implementation of EventSender::mouseUp() and EventSender::mouseDown()
ignores the argument indicating which mouse button to trigger.
​https://bugs.webkit.org/show_bug.cgi?id=30048

This affects the fast/events/mouse-click-events.html layout test.

• DumpRenderTree/qt/jsobjects.cpp: (EventSender::mouseDown): (EventSender::mouseUp):
• DumpRenderTree/qt/jsobjects.h:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/qt/jsobjects.cpp (modified) (1 diff)
• DumpRenderTree/qt/jsobjects.h (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-10-06  Jakub Wieczorek  <faw217@gmail.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] The implementation of EventSender::mouseUp() and EventSender::mouseDown()
+        ignores the argument indicating which mouse button to trigger.
+        https://bugs.webkit.org/show_bug.cgi?id=30048
+
+        This affects the fast/events/mouse-click-events.html layout test.
+
+        * DumpRenderTree/qt/jsobjects.cpp:
+        (EventSender::mouseDown):
+        (EventSender::mouseUp):
+        * DumpRenderTree/qt/jsobjects.h:
+
 2009-10-06  Jakub Wieczorek  <faw217@gmail.com>
 

trunk/WebKitTools/DumpRenderTree/qt/jsobjects.cpp

@@ -375 +375 @@
 }
 
-void EventSender::mouseDown()
-{
+void EventSender::mouseDown(int button)
+{
+    Qt::MouseButton mouseButton;
+    switch (button) {
+    case 0:
+        mouseButton = Qt::LeftButton;
+        break;
+    case 1:
+        mouseButton = Qt::MidButton;
+        break;
+    case 2:
+        mouseButton = Qt::RightButton;
+        break;
+    case 3:
+        // fast/events/mouse-click-events expects the 4th button to be treated as the middle button
+        mouseButton = Qt::MidButton;
+        break;
+    default:
+        mouseButton = Qt::LeftButton;
+        break;
+    }
+
 //     qDebug() << "EventSender::mouseDown" << frame;
-    QMouseEvent event(QEvent::MouseButtonPress, m_mousePos, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
+    QMouseEvent event(QEvent::MouseButtonPress, m_mousePos, mouseButton, mouseButton, Qt::NoModifier);
     QApplication::sendEvent(m_page, &event);
 }
 
-void EventSender::mouseUp()
-{
+void EventSender::mouseUp(int button)
+{
+    Qt::MouseButton mouseButton;
+    switch (button) {
+    case 0:
+        mouseButton = Qt::LeftButton;
+        break;
+    case 1:
+        mouseButton = Qt::MidButton;
+        break;
+    case 2:
+        mouseButton = Qt::RightButton;
+        break;
+    case 3:
+        // fast/events/mouse-click-events expects the 4th button to be treated as the middle button
+        mouseButton = Qt::MidButton;
+        break;
+    default:
+        mouseButton = Qt::LeftButton;
+        break;
+    }
+
 //     qDebug() << "EventSender::mouseUp" << frame;
-    QMouseEvent event(QEvent::MouseButtonRelease, m_mousePos, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
+    QMouseEvent event(QEvent::MouseButtonRelease, m_mousePos, mouseButton, mouseButton, Qt::NoModifier);
     QApplication::sendEvent(m_page, &event);
 }

trunk/WebKitTools/DumpRenderTree/qt/jsobjects.h

@@ -140 +140 @@
 
 public slots:
-    void mouseDown();
-    void mouseUp();
+    void mouseDown(int button = 0);
+    void mouseUp(int button = 0);
     void mouseMoveTo(int x, int y);
     void leapForward(int ms);