Title: [111191] trunk/Source/WebCore
- Revision
- 111191
- Author
- [email protected]
- Date
- 2012-03-19 09:23:16 -0700 (Mon, 19 Mar 2012)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (111190 => 111191)
--- trunk/Source/WebCore/ChangeLog 2012-03-19 16:22:37 UTC (rev 111190)
+++ trunk/Source/WebCore/ChangeLog 2012-03-19 16:23:16 UTC (rev 111191)
@@ -1,3 +1,20 @@
+2012-03-19 Leo Yang <[email protected]>
+
+ [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 <[email protected]>
Select best target for tap gesture.
Modified: trunk/Source/WebCore/platform/PlatformKeyboardEvent.h (111190 => 111191)
--- trunk/Source/WebCore/platform/PlatformKeyboardEvent.h 2012-03-19 16:22:37 UTC (rev 111190)
+++ trunk/Source/WebCore/platform/PlatformKeyboardEvent.h 2012-03-19 16:23:16 UTC (rev 111191)
@@ -55,6 +55,14 @@
class wxKeyEvent;
#endif
+#if PLATFORM(BLACKBERRY)
+namespace BlackBerry {
+namespace Platform {
+class KeyboardEvent;
+}
+}
+#endif
+
#if PLATFORM(EFL)
typedef struct _Evas_Event_Key_Down Evas_Event_Key_Down;
typedef struct _Evas_Event_Key_Up Evas_Event_Key_Up;
@@ -72,6 +80,9 @@
, m_autoRepeat(false)
, m_isKeypad(false)
, m_isSystemKey(false)
+#if PLATFORM(BLACKBERRY)
+ , m_unmodifiedCharacter(0)
+#endif
#if PLATFORM(GTK)
, m_gdkEventKey(0)
#endif
@@ -127,6 +138,10 @@
static bool currentCapsLockState();
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(); }
#endif
@@ -156,6 +171,10 @@
PlatformKeyboardEvent(wxKeyEvent&);
#endif
+#if PLATFORM(BLACKBERRY)
+ PlatformKeyboardEvent(const BlackBerry::Platform::KeyboardEvent&);
+#endif
+
#if PLATFORM(EFL)
PlatformKeyboardEvent(const Evas_Event_Key_Down*);
PlatformKeyboardEvent(const Evas_Event_Key_Up*);
@@ -172,6 +191,10 @@
bool m_isKeypad;
bool m_isSystemKey;
+#if PLATFORM(BLACKBERRY)
+ unsigned short m_unmodifiedCharacter;
+#endif
+
#if PLATFORM(MAC)
RetainPtr<NSEvent> m_macEvent;
#endif
Modified: trunk/Source/WebCore/platform/blackberry/PlatformKeyboardEventBlackBerry.cpp (111190 => 111191)
--- trunk/Source/WebCore/platform/blackberry/PlatformKeyboardEventBlackBerry.cpp 2012-03-19 16:22:37 UTC (rev 111190)
+++ trunk/Source/WebCore/platform/blackberry/PlatformKeyboardEventBlackBerry.cpp 2012-03-19 16:23:16 UTC (rev 111191)
@@ -436,7 +436,7 @@
}
}
-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()))
, m_autoRepeat(false)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
