Bug 896348 Support "Eisu" key value on Mac, Android and Gonk r=smichaud+nchen+mwu+smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Tue, 30 Dec 2014 10:47:55 +0900
changeset 247445 62246121651b04e1ac4cca09b275b09a1e978b7f
parent 247444 82b3c66246637d22ef4473156435b6b49a62d02b
child 247446 3f542e61e7fa6938aec8bc51c19728d1d520bdb3
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmichaud
bugs896348
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 896348 Support "Eisu" key value on Mac, Android and Gonk r=smichaud+nchen+mwu+smaug
dom/events/KeyNameList.h
widget/NativeKeyToDOMKeyName.h
--- a/dom/events/KeyNameList.h
+++ b/dom/events/KeyNameList.h
@@ -144,17 +144,17 @@ DEFINE_KEYNAME_WITH_SAME_NAME(SingleCand
  *****************************************************************************/
 DEFINE_KEYNAME_WITH_SAME_NAME(HangulMode)
 DEFINE_KEYNAME_WITH_SAME_NAME(HanjaMode)
 DEFINE_KEYNAME_WITH_SAME_NAME(JunjaMode)
 
 /******************************************************************************
  * Keys specific to Japanese keyboards
  *****************************************************************************/
-// DEFINE_KEYNAME_WITH_SAME_NAME(Eisu)
+DEFINE_KEYNAME_WITH_SAME_NAME(Eisu)
 DEFINE_KEYNAME_WITH_SAME_NAME(Hankaku)
 DEFINE_KEYNAME_WITH_SAME_NAME(Hiragana)
 DEFINE_KEYNAME_WITH_SAME_NAME(HiraganaKatakana)
 DEFINE_KEYNAME_WITH_SAME_NAME(KanaMode)
 DEFINE_KEYNAME_WITH_SAME_NAME(KanjiMode)
 DEFINE_KEYNAME_WITH_SAME_NAME(Katakana)
 DEFINE_KEYNAME_WITH_SAME_NAME(Romaji)
 DEFINE_KEYNAME_WITH_SAME_NAME(Zenkaku)
--- a/widget/NativeKeyToDOMKeyName.h
+++ b/widget/NativeKeyToDOMKeyName.h
@@ -581,16 +581,20 @@ KEY_MAP_WIN_KOR (HangulMode, VK_HANGUL /
 KEY_MAP_WIN_KOR (HanjaMode, VK_HANJA /* same as VK_KANJI */)
 
 // JunjaMode
 KEY_MAP_WIN     (JunjaMode, VK_JUNJA)
 
 /******************************************************************************
  * Keys specific to Japanese keyboards
  ******************************************************************************/
+// Eisu
+KEY_MAP_COCOA   (Eisu, kVK_JIS_Eisu)
+KEY_MAP_ANDROID (Eisu, AKEYCODE_EISU)
+
 // Hankaku
 KEY_MAP_WIN_JPN (Hankaku, VK_OEM_AUTO)
 KEY_MAP_GTK     (Hankaku, GDK_Hankaku)
 KEY_MAP_QT      (Hankaku, Qt::Key_Hankaku)
 
 // Hiragana
 KEY_MAP_WIN_JPN (Hiragana, VK_OEM_COPY)
 KEY_MAP_GTK     (Hiragana, GDK_Hiragana)
@@ -621,21 +625,18 @@ KEY_MAP_ANDROID (KanjiMode, AKEYCODE_KAN
 
 // Katakana
 KEY_MAP_WIN_JPN (Katakana, VK_OEM_FINISH)
 KEY_MAP_GTK     (Katakana, GDK_Katakana)
 KEY_MAP_QT      (Katakana, Qt::Key_Katakana)
 
 // Romaji
 KEY_MAP_WIN_JPN (Romaji, VK_OEM_BACKTAB)
-KEY_MAP_COCOA   (Romaji, kVK_JIS_Eisu) // XXX Should be "Eisu"
 KEY_MAP_GTK     (Romaji, GDK_Romaji)
 KEY_MAP_QT      (Romaji, Qt::Key_Romaji)
-// Assuming that EISU key of Android is the Eisu key on Mac keyboard.
-KEY_MAP_ANDROID (Romaji, AKEYCODE_EISU) // XXX Should be "Eisu"
 
 // Zenkaku
 KEY_MAP_WIN_JPN (Zenkaku, VK_OEM_ENLW)
 KEY_MAP_GTK     (Zenkaku, GDK_Zenkaku)
 KEY_MAP_QT      (Zenkaku, Qt::Key_Zenkaku)
 
 // ZenkakuHankaku
 KEY_MAP_GTK     (ZenkakuHankaku, GDK_Zenkaku_Hankaku)