Various fixes to mouse wheel scrolling:...

webkit/glue/webinputevent_linux.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "webkit/glue/webinputevent.h"
 
 #include "KeyboardCodes.h"
 #include "KeyCodeConversion.h"
@@ skipping 85 matching lines @@
   if (event->state & GDK_BUTTON1_MASK) {
     button = BUTTON_LEFT;
   } else if (event->state & GDK_BUTTON2_MASK) {
     button = BUTTON_MIDDLE;
   } else if (event->state & GDK_BUTTON3_MASK) {
     button = BUTTON_RIGHT;
   }
 }
 
 WebMouseWheelEvent::WebMouseWheelEvent(const GdkEventScroll* event) {
+  type = MOUSE_WHEEL;
+  button = BUTTON_NONE;
+
   timestamp_sec = GdkEventTimeToWebEventTime(event->time);
   modifiers = GdkStateToWebEventModifiers(event->state);
   x = static_cast<int>(event->x);
   y = static_cast<int>(event->y);
   global_x = static_cast<int>(event->x_root);
   global_y = static_cast<int>(event->y_root);
 
-  type = MOUSE_WHEEL;
-
   // How much should we scroll per mouse wheel event?
   // - Windows uses 3 lines by default and obeys a system setting.
   // - Mozilla has a pref that lets you either use the "system" number of lines
   //   to scroll, or lets the user override it.
   //   For the "system" number of lines, it appears they've hardcoded 3.
   //   See case NS_MOUSE_SCROLL in content/events/src/nsEventStateManager.cpp
   //   and InitMouseScrollEvent in widget/src/gtk2/nsCommonWidget.cpp .
   // - Gtk makes the scroll amount a function of the size of the scroll bar,
   //   which is not available to us here.
   // Instead, we pick a number that empirically matches Firefox's behavior.
-  static const int kWheelDelta = 4;
+  static const float kWheelDelta = 4;
 
   delta_x = 0;
   delta_y = 0;
-
   switch (event->direction) {
     case GDK_SCROLL_UP:
       delta_y = kWheelDelta;
       break;
     case GDK_SCROLL_DOWN:
       delta_y = -kWheelDelta;
       break;
     case GDK_SCROLL_LEFT:
-      delta_x = -kWheelDelta;
+      delta_x = kWheelDelta;
       break;
     case GDK_SCROLL_RIGHT:
-      delta_x = kWheelDelta;
+      delta_x = -kWheelDelta;
       break;
     default:
       break;
   }
+  scroll_by_page = false;
 }
 
 WebKeyboardEvent::WebKeyboardEvent(const GdkEventKey* event) {
   system_key = false;
   modifiers = GdkStateToWebEventModifiers(event->state);
 
   switch (event->type) {
     case GDK_KEY_RELEASE:
       type = KEY_UP;
       break;
@@ skipping 31 matching lines @@
       break;
   }
 
   std::string key_identifier_str =
       webkit_glue::GetKeyIdentifierForWindowsKeyCode(windows_key_code);
   base::strlcpy(key_identifier, key_identifier_str.c_str(),
                 kIdentifierLengthCap);
 
   // TODO(tc): Do we need to set IS_AUTO_REPEAT or IS_KEYPAD?
 }