From a618cc79abfb97731c8e6293b49406458289bb4e Mon Sep 17 00:00:00 2001 From: Masayuki Nakano Date: Tue, 30 Dec 2014 10:47:55 +0900 Subject: [PATCH] Bug 1027472 Support Symbol key value on Android and Gonk r=mwu+nchen+smaug --- dom/events/KeyNameList.h | 2 +- widget/NativeKeyToDOMKeyName.h | 3 +++ widget/android/nsWindow.cpp | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dom/events/KeyNameList.h b/dom/events/KeyNameList.h index 91239e1a0cf..12bad4940f8 100644 --- a/dom/events/KeyNameList.h +++ b/dom/events/KeyNameList.h @@ -46,7 +46,7 @@ DEFINE_KEYNAME_WITH_SAME_NAME(OS) DEFINE_KEYNAME_WITH_SAME_NAME(ScrollLock) DEFINE_KEYNAME_WITH_SAME_NAME(Shift) // DEFINE_KEYNAME_WITH_SAME_NAME(Super) -// DEFINE_KEYNAME_WITH_SAME_NAME(Symbol) +DEFINE_KEYNAME_WITH_SAME_NAME(Symbol) // DEFINE_KEYNAME_WITH_SAME_NAME(SymbolLock) /****************************************************************************** diff --git a/widget/NativeKeyToDOMKeyName.h b/widget/NativeKeyToDOMKeyName.h index c08d7152e79..0d9715d2d5f 100644 --- a/widget/NativeKeyToDOMKeyName.h +++ b/widget/NativeKeyToDOMKeyName.h @@ -170,6 +170,9 @@ KEY_MAP_QT (Shift, Qt::Key_Shift) KEY_MAP_ANDROID (Shift, AKEYCODE_SHIFT_LEFT) KEY_MAP_ANDROID (Shift, AKEYCODE_SHIFT_RIGHT) +// Symbol +KEY_MAP_ANDROID (Symbol, AKEYCODE_SYM) + /****************************************************************************** * Whitespace Keys ******************************************************************************/ diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp index 9db9cb6707a..471a8b03474 100644 --- a/widget/android/nsWindow.cpp +++ b/widget/android/nsWindow.cpp @@ -1375,7 +1375,6 @@ ConvertAndroidKeyCodeToKeyNameIndex(AndroidGeckoEvent& aAndroidGeckoEvent) case AKEYCODE_SOFT_RIGHT: case AKEYCODE_CALL: case AKEYCODE_ENDCALL: - case AKEYCODE_SYM: // Symbol modifier case AKEYCODE_NUM: // XXX Not sure case AKEYCODE_HEADSETHOOK: case AKEYCODE_FOCUS: