Changed PlatformMouseEvent to store the modifier flags of the event

Reviewed by Sam.

* platform/PlatformMouseEvent.h:
(WebCore::PlatformMouseEvent::PlatformMouseEvent):
* platform/mac/PlatformMouseEventMac.mm:
(WebCore::PlatformMouseEvent::PlatformMouseEvent):
* platform/win/PlatformMouseEventWin.cpp:
(WebCore::PlatformMouseEvent::PlatformMouseEvent):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@23996 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bd16f3b6d04a7959d11d887dd5f2a7495c6df8b3..d59b79a06337917d0c9cfd12232cbee1e385dfcf 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2007-07-04  Adam Roben  <aroben@apple.com>
+
+        Changed PlatformMouseEvent to store the modifier flags of the event
+
+        Reviewed by Sam.
+
+        * platform/PlatformMouseEvent.h:
+        (WebCore::PlatformMouseEvent::PlatformMouseEvent):
+        * platform/mac/PlatformMouseEventMac.mm:
+        (WebCore::PlatformMouseEvent::PlatformMouseEvent):
+        * platform/win/PlatformMouseEventWin.cpp:
+        (WebCore::PlatformMouseEvent::PlatformMouseEvent):
+
 2007-07-04  Adam Roben  <aroben@apple.com>
 
         Add HitTestResult::setToNonShadowAncestor

diff --git a/WebCore/platform/PlatformMouseEvent.h b/WebCore/platform/PlatformMouseEvent.h
index ade38bf5fd0be08a4ab8fd6d5bc7c691b0482535..10e83575ba7ff65af05a4d8659eb4dd7d9ab258d 100644 (file)
--- a/WebCore/platform/PlatformMouseEvent.h
+++ b/WebCore/platform/PlatformMouseEvent.h
@@ -73,6 +73,7 @@ namespace WebCore {
             , m_altKey(false)
             , m_metaKey(false)
             , m_timestamp(0)
+            , m_modifierFlags(0)
         {
         }
 
@@ -86,6 +87,7 @@ namespace WebCore {
             , m_altKey(alt)
             , m_metaKey(meta)
             , m_timestamp(timestamp)
+            , m_modifierFlags(0)
         {
         }
 
@@ -101,6 +103,7 @@ namespace WebCore {
         bool ctrlKey() const { return m_ctrlKey; }
         bool altKey() const { return m_altKey; }
         bool metaKey() const { return m_metaKey; }
+        unsigned modifierFlags() const { return m_modifierFlags; }
         
         //time in seconds
         double timestamp() const { return m_timestamp; }
@@ -132,6 +135,7 @@ namespace WebCore {
         bool m_altKey;
         bool m_metaKey;
         double m_timestamp; // unit: seconds
+        unsigned m_modifierFlags;
 #if PLATFORM(MAC)
         int m_eventNumber;
 #endif

diff --git a/WebCore/platform/mac/PlatformMouseEventMac.mm b/WebCore/platform/mac/PlatformMouseEventMac.mm
index c8c43f84be6b7cce7721a2927419c3e5afd657b4..af7415d038c3540d654b32d4d89c902c08874e21 100644 (file)
--- a/WebCore/platform/mac/PlatformMouseEventMac.mm
+++ b/WebCore/platform/mac/PlatformMouseEventMac.mm
@@ -169,6 +169,7 @@ PlatformMouseEvent::PlatformMouseEvent(NSEvent* event)
     , m_altKey([event modifierFlags] & NSAlternateKeyMask)
     , m_metaKey([event modifierFlags] & NSCommandKeyMask)
     , m_timestamp([event timestamp])
+    , m_modifierFlags([event modifierFlags])
     , m_eventNumber([event eventNumber])
 {
 }

diff --git a/WebCore/platform/win/PlatformMouseEventWin.cpp b/WebCore/platform/win/PlatformMouseEventWin.cpp
index e3ac5e5da336d48d378fdba7a237a837363bd6e6..c8b41fd7dab76939fba6a25451ca21316d005f3b 100644 (file)
--- a/WebCore/platform/win/PlatformMouseEventWin.cpp
+++ b/WebCore/platform/win/PlatformMouseEventWin.cpp
@@ -82,6 +82,7 @@ PlatformMouseEvent::PlatformMouseEvent(HWND hWnd, UINT message, WPARAM wParam, L
     , m_metaKey(m_altKey) // FIXME: We'll have to test other browsers
     , m_activatedWebView(activatedWebView)
     , m_eventType(messageToEventType(message))
+    , m_modifierFlags(wParam)
 {
     m_timestamp = ::GetTickCount()*0.001; // GetTickCount returns milliseconds