Merge in WebKit r47029.

1 files changed, 25 insertions, 0 deletions

diff --git a/WebCore/platform/win/WheelEventWin.cpp b/WebCore/platform/win/WheelEventWin.cpp
index e6670a4..3fb8118 100644
--- a/WebCore/platform/win/WheelEventWin.cpp
+++ b/WebCore/platform/win/WheelEventWin.cpp
@@ -23,8 +23,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include "config.h"
 #include "PlatformWheelEvent.h"
 
+#include "FloatPoint.h"
+#include "FloatSize.h"
 #include <windows.h>
 #include <windowsx.h>
 
@@ -62,6 +65,28 @@ static int verticalScrollLines()
     return scrollLines;
 }
 
+PlatformWheelEvent::PlatformWheelEvent(HWND hWnd, const FloatSize& delta, const FloatPoint& location)
+    : m_isAccepted(false)
+    , m_shiftKey(false)
+    , m_ctrlKey(false)
+    , m_altKey(false)
+    , m_metaKey(false)
+{
+    m_deltaX = delta.width();
+    m_deltaY = delta.height();
+
+    m_wheelTicksX = m_deltaX;
+    m_wheelTicksY = m_deltaY;
+
+    // Global Position is just x, y location of event
+    POINT point = {location.x(), location.y()};
+    m_globalPosition = point;
+
+    // Position needs to be translated to our client
+    ScreenToClient(hWnd, &point);
+    m_position = point;
+}
+
 PlatformWheelEvent::PlatformWheelEvent(HWND hWnd, WPARAM wParam, LPARAM lParam, bool isMouseHWheel)
     : m_position(positionForEvent(hWnd, lParam))
     , m_globalPosition(globalPositionForEvent(hWnd, lParam))