[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[abecsi at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 79c6fbb5c584d7573e36d4ab79ba5e7914a042af
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 27 15:01:31 2010 +0000

    2010-07-27  Andras Becsi  <abecsi at webkit.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] WebEventFactory::createWebMouseEvent should follow WebKit2 API changes
            https://bugs.webkit.org/show_bug.cgi?id=43042
    
            * Shared/qt/WebEventFactoryQt.cpp:
            (WebKit::WebEventFactory::createWebMouseEvent):
            Set deltaX, deltaY and deltaZ arguments.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64127 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 969d5d8..d69e8ee 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-27  Andras Becsi  <abecsi at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] WebEventFactory::createWebMouseEvent should follow WebKit2 API changes
+        https://bugs.webkit.org/show_bug.cgi?id=43042
+
+        * Shared/qt/WebEventFactoryQt.cpp:
+        (WebKit::WebEventFactory::createWebMouseEvent):
+        Set deltaX, deltaY and deltaZ arguments.
+
 2010-07-27  Balazs Kelemen  <kb at inf.u-szeged.hu>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/Shared/qt/WebEventFactoryQt.cpp b/WebKit2/Shared/qt/WebEventFactoryQt.cpp
index 5d9fdf1..e1acb46 100644
--- a/WebKit2/Shared/qt/WebEventFactoryQt.cpp
+++ b/WebKit2/Shared/qt/WebEventFactoryQt.cpp
@@ -88,6 +88,7 @@ WebMouseEvent WebEventFactory::createWebMouseEvent(QGraphicsSceneMouseEvent* eve
 {
     IntPoint position(event->pos().toPoint());
     IntPoint globalPosition(event->screenPos());
+    FloatPoint delta(event->pos().x() - event->lastPos().x(), event->pos().y() - event->lastPos().y());
 
     WebEvent::Type type             = webEventTypeForEvent(event);
     WebMouseEvent::Button button    = mouseButtonForEvent(event);
@@ -95,11 +96,13 @@ WebMouseEvent WebEventFactory::createWebMouseEvent(QGraphicsSceneMouseEvent* eve
     int positionY                   = position.y();
     int globalPositionX             = globalPosition.x();
     int globalPositionY             = globalPosition.y();
+    float deltaX                    = delta.x();
+    float deltaY                    = delta.y();
     int clickCount                  = eventClickCount;
     WebEvent::Modifiers modifiers   = modifiersForEvent(event->modifiers());
     double timestamp                = WTF::currentTime();
 
-    return WebMouseEvent(type, button, positionX, positionY, globalPositionX, globalPositionY, clickCount, modifiers, timestamp);
+    return WebMouseEvent(type, button, positionX, positionY, globalPositionX, globalPositionY, deltaX, deltaY, 0.0f, clickCount, modifiers, timestamp);
 }
 
 WebWheelEvent WebEventFactory::createWebWheelEvent(QGraphicsSceneWheelEvent* e)

-- 
WebKit Debian packaging