WebKit merge 41447:41498 [third_party/WebKit]

third_party/WebKit/WebCore/platform/wx/MouseWheelEventWx.cpp

Index: third_party/WebKit/WebCore/platform/wx/MouseWheelEventWx.cpp
===================================================================
--- third_party/WebKit/WebCore/platform/wx/MouseWheelEventWx.cpp	(revision 11154)
+++ third_party/WebKit/WebCore/platform/wx/MouseWheelEventWx.cpp	(working copy)
@@ -25,6 +25,7 @@
 
 #include "config.h"
 #include "PlatformWheelEvent.h"
+#include "Scrollbar.h"
 
 #include <wx/defs.h>
 #include <wx/event.h>
@@ -34,7 +35,7 @@
 PlatformWheelEvent::PlatformWheelEvent(const wxMouseEvent& event, const wxPoint& globalPoint)
     : m_position(event.GetPosition())
     , m_globalPosition(globalPoint)
-    , m_granularity(ScrollByLineWheelEvent)
+    , m_granularity(ScrollByPixelWheelEvent)
     , m_shiftKey(event.ShiftDown())
     , m_ctrlKey(event.ControlDown())
     , m_altKey(event.AltDown())
@@ -44,7 +45,7 @@
     , m_isAccepted(false)
 {
     // FIXME: retrieve the user setting for the number of lines to scroll on each wheel event
-    m_deltaY *= horizontalLineMultiplier();
+    m_deltaY *= (float)cScrollbarPixelsPerLineStep;
 }
 
 }