Title: [117022] trunk/Source/WebCore
- Revision
- 117022
- Author
- [email protected]
- Date
- 2012-05-14 18:10:52 -0700 (Mon, 14 May 2012)
Log Message
[chromium] Prevent KeyCodeConversionAndroid from breaking on next NDK roll
https://bugs.webkit.org/show_bug.cgi?id=86415
Patch by Alexandre Elias <[email protected]> on 2012-05-14
Reviewed by Adam Barth.
The new enum values added in this file have been added in recent
versions of the NDK, so this file will fail to compile with duplicate
enum error when we roll NDK to r7c or higher. A workaround is
to move our enum values to the WebCore namespace. When the NDK
upgrade is complete, we can delete them.
No new tests. (No-op change.)
* platform/chromium/KeyCodeConversionAndroid.cpp:
(WebCore):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (117021 => 117022)
--- trunk/Source/WebCore/ChangeLog 2012-05-15 01:06:42 UTC (rev 117021)
+++ trunk/Source/WebCore/ChangeLog 2012-05-15 01:10:52 UTC (rev 117022)
@@ -1,3 +1,21 @@
+2012-05-14 Alexandre Elias <[email protected]>
+
+ [chromium] Prevent KeyCodeConversionAndroid from breaking on next NDK roll
+ https://bugs.webkit.org/show_bug.cgi?id=86415
+
+ Reviewed by Adam Barth.
+
+ The new enum values added in this file have been added in recent
+ versions of the NDK, so this file will fail to compile with duplicate
+ enum error when we roll NDK to r7c or higher. A workaround is
+ to move our enum values to the WebCore namespace. When the NDK
+ upgrade is complete, we can delete them.
+
+ No new tests. (No-op change.)
+
+ * platform/chromium/KeyCodeConversionAndroid.cpp:
+ (WebCore):
+
2012-05-14 Beth Dakin <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=86420
Modified: trunk/Source/WebCore/platform/chromium/KeyCodeConversionAndroid.cpp (117021 => 117022)
--- trunk/Source/WebCore/platform/chromium/KeyCodeConversionAndroid.cpp 2012-05-15 01:06:42 UTC (rev 117021)
+++ trunk/Source/WebCore/platform/chromium/KeyCodeConversionAndroid.cpp 2012-05-15 01:10:52 UTC (rev 117022)
@@ -33,6 +33,8 @@
#include <android/keycodes.h>
+namespace WebCore {
+
// The Android NDK does not provide values for these yet:
enum {
AKEYCODE_ESCAPE = 111,
@@ -80,8 +82,6 @@
AKEYCODE_CHANNEL_DOWN = 167,
};
-namespace WebCore {
-
int windowsKeyCodeForKeyEvent(unsigned int keyCode)
{
// Does not provide all key codes, and does not handle all keys.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
