Changeset 111191 in webkit

Timestamp:

Mar 19, 2012 9:23:16 AM (12 years ago)

Author:

leo.yang@torchmobile.com.cn

Message:

[BlackBerry] Upstream the BlackBerry change to platform/PlatformKeyboardEvent.h
​https://bugs.webkit.org/show_bug.cgi?id=81312

Reviewed by Rob Buis.

• platform/PlatformKeyboardEvent.h:

(Platform):
(WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
(PlatformKeyboardEvent):
(WebCore::PlatformKeyboardEvent::unmodifiedCharacter):
Add BlackBerry specific constructor and member fields.

• platform/blackberry/PlatformKeyboardEventBlackBerry.cpp:

(WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
Change the parameter type to const reference type to adapt to the declaration.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/PlatformKeyboardEvent.h (modified) (5 diffs)
• platform/blackberry/PlatformKeyboardEventBlackBerry.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-19  Leo Yang  <leo.yang@torchmobile.com.cn>
+
+        [BlackBerry] Upstream the BlackBerry change to platform/PlatformKeyboardEvent.h
+        https://bugs.webkit.org/show_bug.cgi?id=81312
+
+        Reviewed by Rob Buis.
+
+        * platform/PlatformKeyboardEvent.h:
+        (Platform):
+        (WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
+        (PlatformKeyboardEvent):
+        (WebCore::PlatformKeyboardEvent::unmodifiedCharacter):
+        Add BlackBerry specific constructor and member fields.
+        * platform/blackberry/PlatformKeyboardEventBlackBerry.cpp:
+        (WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
+        Change the parameter type to const reference type to adapt to the declaration.
+
 2012-03-19  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
 

trunk/Source/WebCore/platform/PlatformKeyboardEvent.h

@@ -56 +56 @@
 #endif
 
+#if PLATFORM(BLACKBERRY)
+namespace BlackBerry {
+namespace Platform {
+class KeyboardEvent;
+}
+}
+#endif
+
 #if PLATFORM(EFL)
 typedef struct _Evas_Event_Key_Down Evas_Event_Key_Down;
@@ -73 +81 @@
             , m_isKeypad(false)
             , m_isSystemKey(false)
+#if PLATFORM(BLACKBERRY)
+            , m_unmodifiedCharacter(0)
+#endif
 #if PLATFORM(GTK)
             , m_gdkEventKey(0)
@@ -128 +139 @@
         static void getCurrentModifierState(bool& shiftKey, bool& ctrlKey, bool& altKey, bool& metaKey);
 
+#if PLATFORM(BLACKBERRY)
+        unsigned short unmodifiedCharacter() const { return m_unmodifiedCharacter; }
+#endif
+
 #if PLATFORM(MAC)
         NSEvent* macEvent() const { return m_macEvent.get(); }
@@ -155 +170 @@
 #if PLATFORM(WX)
         PlatformKeyboardEvent(wxKeyEvent&);
+#endif
+
+#if PLATFORM(BLACKBERRY)
+        PlatformKeyboardEvent(const BlackBerry::Platform::KeyboardEvent&);
 #endif
 
@@ -173 +192 @@
         bool m_isSystemKey;
 
+#if PLATFORM(BLACKBERRY)
+        unsigned short m_unmodifiedCharacter;
+#endif
+
 #if PLATFORM(MAC)
         RetainPtr<NSEvent> m_macEvent;

trunk/Source/WebCore/platform/blackberry/PlatformKeyboardEventBlackBerry.cpp

@@ -437 +437 @@
 }
 
-PlatformKeyboardEvent::PlatformKeyboardEvent(BlackBerry::Platform::KeyboardEvent event)
+PlatformKeyboardEvent::PlatformKeyboardEvent(const BlackBerry::Platform::KeyboardEvent& event)
     : PlatformEvent(toWebCorePlatformKeyboardEventType(event.type()), event.shiftActive() || (event.character() == KEYCODE_BACK_TAB), event.ctrlActive(), event.altActive(), false)
     , m_keyIdentifier(keyIdentifierForBlackBerryCharacter(event.character()))