Title: [142882] trunk/Source
- Revision
- 142882
- Author
- mifen...@rim.com
- Date
- 2013-02-14 09:11:13 -0800 (Thu, 14 Feb 2013)
Log Message
[BlackBerry] Update keyboard event details to match platform details.
https://bugs.webkit.org/show_bug.cgi?id=109693
Reviewed by Yong Li.
PR 220170.
Source/WebCore:
Update the keyboard event details to match the
platform details available.
Rename helper function to better describe the conversion.
Reviewed Internally by Nima Ghanavatian and Gen Mak.
* platform/blackberry/PlatformKeyboardEventBlackBerry.cpp:
(WebCore::windowsKeyCodeForBlackBerryKeycode):
(WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
Source/WebKit/blackberry:
Update keyboard event details.
Reviewed Internally by Nima Ghanavatian and Gen Mak.
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPage::keyEvent):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (142881 => 142882)
--- trunk/Source/WebCore/ChangeLog 2013-02-14 17:06:11 UTC (rev 142881)
+++ trunk/Source/WebCore/ChangeLog 2013-02-14 17:11:13 UTC (rev 142882)
@@ -1,3 +1,23 @@
+2013-02-14 Mike Fenton <mifen...@rim.com>
+
+ [BlackBerry] Update keyboard event details to match platform details.
+ https://bugs.webkit.org/show_bug.cgi?id=109693
+
+ Reviewed by Yong Li.
+
+ PR 220170.
+
+ Update the keyboard event details to match the
+ platform details available.
+
+ Rename helper function to better describe the conversion.
+
+ Reviewed Internally by Nima Ghanavatian and Gen Mak.
+
+ * platform/blackberry/PlatformKeyboardEventBlackBerry.cpp:
+ (WebCore::windowsKeyCodeForBlackBerryKeycode):
+ (WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
+
2013-02-08 Andrey Kosyakov <ca...@chromium.org>
Web Inspector: expose did{Begin,Cancel}Frame() and {will,did}Composite() on WebDebToolsAgent
@@ -49192,7 +49212,7 @@
2013-01-06 Sebastian Dröge <sebastian.dro...@collabora.co.uk>
- Bug 106177 - [GStreamer] Don't call gst_video_info_from_caps() with non-fixed caps
+ Bug 106177 - [GStreamer] Don't call gst_video_info_from_caps() with non-fixed caps
https://bugs.webkit.org/show_bug.cgi?id=106177
Reviewed by Martin Robinson.
Modified: trunk/Source/WebCore/platform/blackberry/PlatformKeyboardEventBlackBerry.cpp (142881 => 142882)
--- trunk/Source/WebCore/platform/blackberry/PlatformKeyboardEventBlackBerry.cpp 2013-02-14 17:06:11 UTC (rev 142881)
+++ trunk/Source/WebCore/platform/blackberry/PlatformKeyboardEventBlackBerry.cpp 2013-02-14 17:11:13 UTC (rev 142882)
@@ -111,9 +111,9 @@
}
}
-static int windowsKeyCodeForBlackBerryCharacter(unsigned character)
+static int windowsKeyCodeForBlackBerryKeycode(unsigned keycode)
{
- switch (character) {
+ switch (keycode) {
case KEYCODE_RETURN:
case KEYCODE_KP_ENTER:
return VK_RETURN; // (0D) Return key
@@ -439,9 +439,9 @@
}
PlatformKeyboardEvent::PlatformKeyboardEvent(const BlackBerry::Platform::KeyboardEvent& event)
- : PlatformEvent(toWebCorePlatformKeyboardEventType(event.type()), event.shiftActive() || (event.character() == KEYCODE_BACK_TAB), event.ctrlActive(), event.altActive(), false, currentTime())
+ : PlatformEvent(toWebCorePlatformKeyboardEventType(event.type()), event.shiftActive() || (event.character() == KEYCODE_BACK_TAB), event.ctrlActive(), event.altActive(), event.metaActive(), currentTime())
, m_keyIdentifier(keyIdentifierForBlackBerryCharacter(event.character()))
- , m_windowsVirtualKeyCode(windowsKeyCodeForBlackBerryCharacter(event.character()))
+ , m_windowsVirtualKeyCode(windowsKeyCodeForBlackBerryKeycode(event.keycode() ? event.keycode() : event.character())) // if keycode isn't valid, use character as it's unconverted.
, m_autoRepeat(false)
, m_isKeypad(false)
, m_unmodifiedCharacter(event.character())
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (142881 => 142882)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-02-14 17:06:11 UTC (rev 142881)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-02-14 17:11:13 UTC (rev 142882)
@@ -4334,7 +4334,8 @@
bool handled = d->m_inputHandler->handleKeyboardInput(keyboardEvent);
- if (!handled && keyboardEvent.type() == Platform::KeyboardEvent::KeyDown && !d->m_inputHandler->isInputMode()) {
+ // This is hotkey handling and perhaps doesn't belong here.
+ if (!handled && keyboardEvent.type() == Platform::KeyboardEvent::KeyDown && !d->m_inputHandler->isInputMode() && !keyboardEvent.modifiers()) {
IntPoint previousPos = d->scrollPosition();
handleScrolling(keyboardEvent.character(), d);
handled = previousPos != d->scrollPosition();
Modified: trunk/Source/WebKit/blackberry/ChangeLog (142881 => 142882)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-02-14 17:06:11 UTC (rev 142881)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-02-14 17:11:13 UTC (rev 142882)
@@ -1,3 +1,19 @@
+2013-02-14 Mike Fenton <mifen...@rim.com>
+
+ [BlackBerry] Update keyboard event details to match platform details.
+ https://bugs.webkit.org/show_bug.cgi?id=109693
+
+ Reviewed by Yong Li.
+
+ PR 220170.
+
+ Update keyboard event details.
+
+ Reviewed Internally by Nima Ghanavatian and Gen Mak.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPage::keyEvent):
+
2013-02-08 Andrey Kosyakov <ca...@chromium.org>
Web Inspector: expose did{Begin,Cancel}Frame() and {will,did}Composite() on WebDebToolsAgent
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
