diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-12 15:03:33 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-12 15:03:33 +0200 |
| commit | 2f359ed80ccb2cab440c0cda886404ed42ad9fdf (patch) | |
| tree | 54255f012f5549fbf80eeb8be6afe8167620c303 | |
| parent | b7d9dad58e5a3f87a6c767412941700bc8010044 (diff) | |
| download | UXP-2f359ed80ccb2cab440c0cda886404ed42ad9fdf.tar UXP-2f359ed80ccb2cab440c0cda886404ed42ad9fdf.tar.gz UXP-2f359ed80ccb2cab440c0cda886404ed42ad9fdf.tar.lz UXP-2f359ed80ccb2cab440c0cda886404ed42ad9fdf.tar.xz UXP-2f359ed80ccb2cab440c0cda886404ed42ad9fdf.zip | |
Convert uses of KEY_MAP_ANDROID_EXCEPT_B2G to KEY_MAP_ANDROID
| -rw-r--r-- | widget/NativeKeyToDOMKeyName.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/widget/NativeKeyToDOMKeyName.h b/widget/NativeKeyToDOMKeyName.h index c00cdb2b6..a818108db 100644 --- a/widget/NativeKeyToDOMKeyName.h +++ b/widget/NativeKeyToDOMKeyName.h @@ -25,12 +25,7 @@ #define KEY_MAP_COCOA(aCPPKeyName, aNativeKey) // GTK #define KEY_MAP_GTK(aCPPKeyName, aNativeKey) -// Android and B2G #define KEY_MAP_ANDROID(aCPPKeyName, aNativeKey) -// Only for Android -#define KEY_MAP_ANDROID_EXCEPT_B2G(aCPPKeyName, aNativeKey) -// Only for B2G -#define KEY_MAP_B2G(aCPPKeyName, aNativeKey) #if defined(XP_WIN) #if defined(NS_NATIVE_KEY_TO_DOM_KEY_NAME_INDEX) @@ -80,9 +75,6 @@ #undef KEY_MAP_ANDROID #define KEY_MAP_ANDROID(aCPPKeyName, aNativeKey) \ NS_NATIVE_KEY_TO_DOM_KEY_NAME_INDEX(aNativeKey, KEY_NAME_INDEX_##aCPPKeyName) -#undef KEY_MAP_ANDROID_EXCEPT_B2G -#define KEY_MAP_ANDROID_EXCEPT_B2G(aCPPKeyName, aNativeKey) \ - NS_NATIVE_KEY_TO_DOM_KEY_NAME_INDEX(aNativeKey, KEY_NAME_INDEX_##aCPPKeyName) #endif /****************************************************************************** @@ -1033,11 +1025,10 @@ KEY_MAP_ANDROID (Call, AKEYCODE_CALL) KEY_MAP_ANDROID (Camera, AKEYCODE_CAMERA) // CameraFocus -KEY_MAP_ANDROID_EXCEPT_B2G(CameraFocus, AKEYCODE_FOCUS) +KEY_MAP_ANDROID (CameraFocus, AKEYCODE_FOCUS) // GoHome -KEY_MAP_ANDROID_EXCEPT_B2G(GoHome, AKEYCODE_HOME) -KEY_MAP_B2G (HomeScreen, AKEYCODE_HOME) +KEY_MAP_ANDROID (GoHome, AKEYCODE_HOME) /****************************************************************************** * TV Keys @@ -1134,5 +1125,3 @@ KEY_MAP_ANDROID (SoftRight, AKEYCODE_SOFT_RIGHT) #undef KEY_MAP_COCOA #undef KEY_MAP_GTK #undef KEY_MAP_ANDROID -#undef KEY_MAP_ANDROID_EXCEPT_B2G -#undef KEY_MAP_B2G |