Changeset 86273 in webkit

Timestamp:

May 11, 2011 2:35:49 PM (13 years ago)

Author:

dbates@webkit.org

Message:

2011-05-11 Daniel Bates <​dbates@rim.com>

Reviewed by Antonio Gomes.

[Qt] Extract code to set mouse event modifiers into common function
​https://bugs.webkit.org/show_bug.cgi?id=60649

Consolidate code to set the keyboard modifiers for a mouse event into a common
function that can be used by both PlatformMouseEvent(QGraphicsSceneMouseEvent*, int clickCount)
and PlatformMouseEvent(QInputEvent*, int clickCount) so as to remove duplicate code.

No functionality was changed. So, no new tests.

• platform/qt/PlatformMouseEventQt.cpp: (WebCore::mouseEventModifiersFromQtKeyboardModifiers): Added. (WebCore::PlatformMouseEvent::PlatformMouseEvent): Modified to call mouseEventModifiersFromQtKeyboardModifiers().

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/qt/PlatformMouseEventQt.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-11  Daniel Bates  <dbates@rim.com>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Extract code to set mouse event modifiers into common function
+        https://bugs.webkit.org/show_bug.cgi?id=60649
+
+        Consolidate code to set the keyboard modifiers for a mouse event into a common
+        function that can be used by both PlatformMouseEvent(QGraphicsSceneMouseEvent*, int clickCount)
+        and PlatformMouseEvent(QInputEvent*, int clickCount) so as to remove duplicate code.
+
+        No functionality was changed. So, no new tests.
+
+        * platform/qt/PlatformMouseEventQt.cpp:
+        (WebCore::mouseEventModifiersFromQtKeyboardModifiers): Added.
+        (WebCore::PlatformMouseEvent::PlatformMouseEvent): Modified to call mouseEventModifiersFromQtKeyboardModifiers().
+
 2011-05-11  Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WebCore/platform/qt/PlatformMouseEventQt.cpp

@@ -35 +35 @@
 namespace WebCore {
 
+static void mouseEventModifiersFromQtKeyboardModifiers(Qt::KeyboardModifiers keyboardModifiers, bool& altKey, bool& ctrlKey, bool& metaKey, bool& shiftKey)
+{
+    altKey = keyboardModifiers & Qt::AltModifier;
+    ctrlKey = keyboardModifiers & Qt::ControlModifier;
+    metaKey = keyboardModifiers & Qt::MetaModifier;
+    shiftKey = keyboardModifiers & Qt::ShiftModifier;
+}
+
 #if !defined(QT_NO_GRAPHICSVIEW)
 PlatformMouseEvent::PlatformMouseEvent(QGraphicsSceneMouseEvent* event, int clickCount)
@@ -66 +74 @@
 
     m_clickCount = clickCount;
-    m_shiftKey =  (event->modifiers() & Qt::ShiftModifier);
-    m_ctrlKey = (event->modifiers() & Qt::ControlModifier);
-    m_altKey =  (event->modifiers() & Qt::AltModifier);
-    m_metaKey = (event->modifiers() & Qt::MetaModifier);
+    mouseEventModifiersFromQtKeyboardModifiers(event->modifiers(), m_altKey, m_ctrlKey, m_metaKey, m_shiftKey);
 }
 #endif // QT_NO_GRAPHICSVIEW
@@ -122 +127 @@
 
     m_clickCount = clickCount;
-    m_shiftKey =  (event->modifiers() & Qt::ShiftModifier);
-    m_ctrlKey = (event->modifiers() & Qt::ControlModifier);
-    m_altKey =  (event->modifiers() & Qt::AltModifier);
-    m_metaKey = (event->modifiers() & Qt::MetaModifier);
+    mouseEventModifiersFromQtKeyboardModifiers(event->modifiers(), m_altKey, m_ctrlKey, m_metaKey, m_shiftKey);
 }