[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 777ab11567d7aba066c79680fe4a778f2e49f0b6
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 23 09:14:57 2010 +0000

    2010-02-23  Stephan Aßmus  <superstippi at gmx.de>
    
            Reviewed by Eric Seidel.
    
            Fix various issues in PlatformWheelEventHaiku.
            https://bugs.webkit.org/show_bug.cgi?id=34685
    
            Covered by existing tests.
    
            Fixed coding style violations.
            Synced extracting the correct coordinates with Haiku WebKit implementation.
            Added extracting modifier key flags.
    
            * platform/haiku/PlatformWheelEventHaiku.cpp:
            (WebCore::PlatformWheelEvent::PlatformWheelEvent):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55130 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f939328..4fd7777 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-02-23  Stephan Aßmus  <superstippi at gmx.de>
+
+        Reviewed by Eric Seidel.
+
+        Fix various issues in PlatformWheelEventHaiku.
+        https://bugs.webkit.org/show_bug.cgi?id=34685
+
+        Covered by existing tests.
+        
+        Fixed coding style violations.
+        Synced extracting the correct coordinates with Haiku WebKit implementation.
+        Added extracting modifier key flags.
+
+        * platform/haiku/PlatformWheelEventHaiku.cpp:
+        (WebCore::PlatformWheelEvent::PlatformWheelEvent):
+
 2010-02-23  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/haiku/PlatformWheelEventHaiku.cpp b/WebCore/platform/haiku/PlatformWheelEventHaiku.cpp
index 21003b6..351b4ec 100644
--- a/WebCore/platform/haiku/PlatformWheelEventHaiku.cpp
+++ b/WebCore/platform/haiku/PlatformWheelEventHaiku.cpp
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2007 Ryan Leavengood <leavengood at gmail.com>
  * Copyright (C) 2009 Maxime Simon <simon.maxime at gmail.com>
+ * Copyright (C) 2010 Stephan Aßmus <superstippi at gmx.de>
  *
  * All rights reserved.
  *
@@ -31,6 +32,7 @@
 
 #include "Scrollbar.h"
 
+#include <InterfaceDefs.h>
 #include <Message.h>
 #include <Point.h>
 
@@ -38,24 +40,23 @@
 namespace WebCore {
 
 PlatformWheelEvent::PlatformWheelEvent(BMessage* message)
-    : m_granularity(ScrollByPixelWheelEvent)
-    , m_shiftKey(false)
-    , m_ctrlKey(false)
-    , m_altKey(false)
-    , m_metaKey(false)
+    : m_position(message->FindPoint("be:view_where"))
+    , m_globalPosition(message->FindPoint("screen_where"))
+    , m_deltaX(message->FindFloat("be:wheel_delta_x"))
+    , m_deltaY(message->FindFloat("be:wheel_delta_y"))
+    , m_wheelTicksX(m_deltaX)
+    , m_wheelTicksY(m_deltaY)
+    , m_granularity(ScrollByPixelWheelEvent)
     , m_isAccepted(false)
 {
-    m_position = IntPoint(message->FindPoint("position"));
-    m_globalPosition = IntPoint(message->FindPoint("global_position"));
-
-    m_deltaX = message->FindFloat("be:wheel_delta_x");
-    m_deltaY = message->FindFloat("be:wheel_delta_y");
-
-    m_wheelTicksX = m_deltaX;
-    m_wheelTicksY = m_deltaY;
-
     m_deltaX *= -Scrollbar::pixelsPerLineStep();
     m_deltaY *= -Scrollbar::pixelsPerLineStep();
+
+    int32 modifiers = message->FindInt32("modifiers");
+    m_shiftKey = modifiers & B_SHIFT_KEY;
+    m_ctrlKey = modifiers & B_CONTROL_KEY;
+    m_altKey = modifiers & B_COMMAND_KEY;
+    m_metaKey = modifiers & B_OPTION_KEY;
 }
 
 } // namespace WebCore

-- 
WebKit Debian packaging