[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 5b560f6e4168bae0f2e550668d5faffbeadfc08d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 2 23:21:55 2009 +0000

    2009-12-02  Evan Stade  <estade at chromium.org>
    
            Reviewed by Darin Fisher.
    
            https://bugs.webkit.org/show_bug.cgi?id=32029
            Mousewheel event delta has reversed sign on Linux Chrome.
    
            No new tests (layout tests don't cover event conversion code).
            Manual test: http://www.switchonthecode.com/tutorials/javascript-tutorial-the-scroll-wheel
    
            * src/gtk/WebInputEventFactory.cpp:
            (WebKit::WebInputEventFactory::mouseWheelEvent):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51614 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 487b601..1da8778 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-02  Evan Stade  <estade at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32029
+        Mousewheel event delta has reversed sign on Linux Chrome.
+
+        No new tests (layout tests don't cover event conversion code).
+        Manual test: http://www.switchonthecode.com/tutorials/javascript-tutorial-the-scroll-wheel
+
+        * src/gtk/WebInputEventFactory.cpp:
+        (WebKit::WebInputEventFactory::mouseWheelEvent):
+
 2009-12-02  Anton Muhin  <antonm at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKit/chromium/src/gtk/WebInputEventFactory.cpp b/WebKit/chromium/src/gtk/WebInputEventFactory.cpp
index 449dee1..7125a16 100644
--- a/WebKit/chromium/src/gtk/WebInputEventFactory.cpp
+++ b/WebKit/chromium/src/gtk/WebInputEventFactory.cpp
@@ -482,11 +482,11 @@ WebMouseWheelEvent WebInputEventFactory::mouseWheelEvent(const GdkEventScroll* e
         break;
     case GDK_SCROLL_LEFT:
         result.deltaX = scrollbarPixelsPerTick;
-        result.wheelTicksX = -1;  // Match Windows positive/negative orientation
+        result.wheelTicksX = 1;
         break;
     case GDK_SCROLL_RIGHT:
         result.deltaX = -scrollbarPixelsPerTick;
-        result.wheelTicksX = 1;
+        result.wheelTicksX = -1;
         break;
     }
 

-- 
WebKit Debian packaging