Convert uses of KEY_MAP_ANDROID_EXCEPT_B2G to KEY_MAP_ANDROID

pull/1/head
wolfbeast 4 years ago committed by Roy Tam
parent 719ac1bc38
commit 9195e9e4e3
  1. 15
      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

Loading…
Cancel
Save