[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[vestbo at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 040c942932ec5115883db69ae56e7cca6f0a113c
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 27 11:33:44 2009 +0000

    [Qt] Don't lose remainder when computing wheel event deltas
    
    Reviewed by Lars Knoll.
    
    * platform/qt/WheelEventQt.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50139 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9d7f36b..f55b8e3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-27  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Lars Knoll.
+
+        [Qt] Don't lose remainder when computing wheel event deltas
+
+        * platform/qt/WheelEventQt.cpp:
+
 2009-10-27  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
         Reviewed by Antti Koivisto.
diff --git a/WebCore/platform/qt/WheelEventQt.cpp b/WebCore/platform/qt/WheelEventQt.cpp
index 66118e1..9cc27ab 100644
--- a/WebCore/platform/qt/WheelEventQt.cpp
+++ b/WebCore/platform/qt/WheelEventQt.cpp
@@ -32,11 +32,11 @@ namespace WebCore {
 void PlatformWheelEvent::applyDelta(int delta, Qt::Orientation orientation)
 {
     if (orientation == Qt::Horizontal) {
-        m_deltaX = (delta / 120);
+        m_deltaX = (delta / 120.0f);
         m_deltaY = 0;
     } else {
         m_deltaX = 0;
-        m_deltaY = (delta / 120);
+        m_deltaY = (delta / 120.0f);
     }
 
     m_wheelTicksX = m_deltaX;

-- 
WebKit Debian packaging