[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 0df5f0cb4cb4f0251c56e1617a3b478ed2632661
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 6 11:42:29 2009 +0000

    2009-10-06  Jakub Wieczorek  <faw217 at 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:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49167 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9f6a205..9b97117 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,21 @@
 
         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 at gmail.com>
+
+        Reviewed by Simon Hausmann.
+
         [Qt] Fix the EventSender::keyDown() implementation
         https://bugs.webkit.org/show_bug.cgi?id=30043
 
diff --git a/WebKitTools/DumpRenderTree/qt/jsobjects.cpp b/WebKitTools/DumpRenderTree/qt/jsobjects.cpp
index 037202a..b374af2 100644
--- a/WebKitTools/DumpRenderTree/qt/jsobjects.cpp
+++ b/WebKitTools/DumpRenderTree/qt/jsobjects.cpp
@@ -374,17 +374,57 @@ EventSender::EventSender(QWebPage *parent)
     m_page = parent;
 }
 
-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);
 }
 
diff --git a/WebKitTools/DumpRenderTree/qt/jsobjects.h b/WebKitTools/DumpRenderTree/qt/jsobjects.h
index d01ed75..4c4f5b7 100644
--- a/WebKitTools/DumpRenderTree/qt/jsobjects.h
+++ b/WebKitTools/DumpRenderTree/qt/jsobjects.h
@@ -139,8 +139,8 @@ public:
     EventSender(QWebPage *parent);
 
 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);
     void keyDown(const QString &string, const QStringList &modifiers=QStringList());

-- 
WebKit Debian packaging