[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 46de402687812514a5643c0e6b1aae1f5d6067d6
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 16 09:54:34 2009 +0000

    2009-12-16  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Simon Hausmann.
    
            [Qt] Maintain button state between mouse events.
    
            This allows eventSender to generate drag events.
    
            https://bugs.webkit.org/show_bug.cgi?id=32601
    
            * DumpRenderTree/qt/EventSenderQt.cpp:
            (EventSender::mouseDown):
            (EventSender::mouseUp):
            (EventSender::mouseMoveTo):
            * DumpRenderTree/qt/EventSenderQt.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52192 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d58c5ca..252b490 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2009-12-16  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Maintain button state between mouse events.
+
+        This allows eventSender to generate drag events.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32601
+
+        * DumpRenderTree/qt/EventSenderQt.cpp:
+        (EventSender::mouseDown):
+        (EventSender::mouseUp):
+        (EventSender::mouseMoveTo):
+        * DumpRenderTree/qt/EventSenderQt.h:
+
 2009-12-15  Chris Jerdonek  <chris.jerdonek at gmail.com>
 
         Reviewed by David Levin.
diff --git a/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp b/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
index 628ef80..d4f9383 100644
--- a/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
@@ -67,8 +67,10 @@ void EventSender::mouseDown(int button)
         break;
     }
 
+    m_mouseButtons |= mouseButton;
+
 //     qDebug() << "EventSender::mouseDown" << frame;
-    QMouseEvent event(QEvent::MouseButtonPress, m_mousePos, mouseButton, mouseButton, Qt::NoModifier);
+    QMouseEvent event(QEvent::MouseButtonPress, m_mousePos, m_mousePos, mouseButton, m_mouseButtons, Qt::NoModifier);
     QApplication::sendEvent(m_page, &event);
 }
 
@@ -94,8 +96,10 @@ void EventSender::mouseUp(int button)
         break;
     }
 
+    m_mouseButtons &= ~mouseButton;
+
 //     qDebug() << "EventSender::mouseUp" << frame;
-    QMouseEvent event(QEvent::MouseButtonRelease, m_mousePos, mouseButton, mouseButton, Qt::NoModifier);
+    QMouseEvent event(QEvent::MouseButtonRelease, m_mousePos, m_mousePos, mouseButton, m_mouseButtons, Qt::NoModifier);
     QApplication::sendEvent(m_page, &event);
 }
 
@@ -103,7 +107,7 @@ void EventSender::mouseMoveTo(int x, int y)
 {
 //     qDebug() << "EventSender::mouseMoveTo" << x << y;
     m_mousePos = QPoint(x, y);
-    QMouseEvent event(QEvent::MouseMove, m_mousePos, Qt::NoButton, Qt::NoButton, Qt::NoModifier);
+    QMouseEvent event(QEvent::MouseMove, m_mousePos, m_mousePos, Qt::NoButton, m_mouseButtons, Qt::NoModifier);
     QApplication::sendEvent(m_page, &event);
 }
 
diff --git a/WebKitTools/DumpRenderTree/qt/EventSenderQt.h b/WebKitTools/DumpRenderTree/qt/EventSenderQt.h
index 30735c3..8e9467a 100644
--- a/WebKitTools/DumpRenderTree/qt/EventSenderQt.h
+++ b/WebKitTools/DumpRenderTree/qt/EventSenderQt.h
@@ -70,6 +70,7 @@ public slots:
 private:
     void sendTouchEvent(QEvent::Type);
     QPoint m_mousePos;
+    Qt::MouseButtons m_mouseButtons;
     QWebPage* m_page;
     int m_timeLeap;
     QWebFrame* frameUnderMouse() const;

-- 
WebKit Debian packaging