Various fixes to mouse wheel scrolling:...

webkit/glue/event_conversion.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 "base/compiler_specific.h"
 
 #include "KeyboardCodes.h"
 #include "StringImpl.h"  // This is so that the KJS build works
@@ skipping 105 matching lines @@
     m_clickCount = e.layout_test_click_count;
   }
 }
 
 // MakePlatformWheelEvent -----------------------------------------------------
 
 MakePlatformWheelEvent::MakePlatformWheelEvent(Widget* widget,
                                                const WebMouseWheelEvent& e) {
   m_position = widget->convertFromContainingWindow(IntPoint(e.x, e.y));
   m_globalPosition = IntPoint(e.global_x, e.global_y);
-  m_deltaX = static_cast<float>(e.delta_x);
-  m_deltaY = static_cast<float>(e.delta_y);
+  m_deltaX = e.delta_x;
+  m_deltaY = e.delta_y;
   m_isAccepted = false;
-  m_granularity = ScrollByLineWheelEvent;
+  m_granularity = e.scroll_by_page ?
+      ScrollByPageWheelEvent : ScrollByLineWheelEvent;
   m_shiftKey = (e.modifiers & WebInputEvent::SHIFT_KEY) != 0;
   m_ctrlKey = (e.modifiers & WebInputEvent::CTRL_KEY) != 0;
   m_altKey = (e.modifiers & WebInputEvent::ALT_KEY) != 0;
   m_metaKey = (e.modifiers & WebInputEvent::META_KEY) != 0;
 }
 
 // MakePlatformKeyboardEvent --------------------------------------------------
 
 static inline const PlatformKeyboardEvent::Type ToPlatformKeyboardEventType(
     WebInputEvent::Type type) {
@@ skipping 53 matching lines @@
   switch (windowsVirtualKeyCode()) {
     case VKEY_BACK:
     case VKEY_ESCAPE:
       return false;
 
     default:
       break;
   }
   return true;
 }