Changeset 117022 in webkit

Timestamp:

May 14, 2012, 6:10:52 PM (14 years ago)

Author:

abarth@webkit.org

Message:

[chromium] Prevent KeyCodeConversionAndroid from breaking on next NDK roll
​https://bugs.webkit.org/show_bug.cgi?id=86415

Patch by Alexandre Elias <​aelias@google.com> 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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/chromium/KeyCodeConversionAndroid.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-14  Alexandre Elias  <aelias@google.com>
+
+        [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  <bdakin@apple.com>
 

trunk/Source/WebCore/platform/chromium/KeyCodeConversionAndroid.cpp

@@ -33 +33 @@
 
 #include <android/keycodes.h>
+
+namespace WebCore {
 
 // The Android NDK does not provide values for these yet:
@@ -80 +82 @@
     AKEYCODE_CHANNEL_DOWN    = 167,
 };
-
-namespace WebCore {
 
 int windowsKeyCodeForKeyEvent(unsigned int keyCode)