Bug 936315 Rename 'Nonconvert', 'HalfWidth', 'RomanCharacters' and 'FullWidth' to 'NonConvert', 'Hankaku', 'Romaji' and 'Zenkaku' r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Tue, 30 Dec 2014 10:47:54 +0900
changeset 221621 e5860aab53a5fe1bec8fa29c6cccdf4fbe096d0a
parent 221620 20b4fe3c7dcc573f4e0f8914c94ebbe3209d19ea
child 221622 0371226486c07ac2c54773bf1c742c2dcd6264f5
push id10617
push userkwierso@gmail.com
push dateWed, 31 Dec 2014 00:06:35 +0000
treeherderfx-team@edccc126caae [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs936315
milestone37.0a1
Bug 936315 Rename 'Nonconvert', 'HalfWidth', 'RomanCharacters' and 'FullWidth' to 'NonConvert', 'Hankaku', 'Romaji' and 'Zenkaku' r=smaug
dom/events/KeyNameList.h
widget/NativeKeyToDOMKeyName.h
--- a/dom/events/KeyNameList.h
+++ b/dom/events/KeyNameList.h
@@ -129,40 +129,40 @@ DEFINE_KEYNAME_WITH_SAME_NAME(Convert)
 // DEFINE_KEYNAME_WITH_SAME_NAME(Dead)
 DEFINE_KEYNAME_WITH_SAME_NAME(FinalMode)
 // DEFINE_KEYNAME_WITH_SAME_NAME(GroupFirst)
 // DEFINE_KEYNAME_WITH_SAME_NAME(GroupLast)
 // DEFINE_KEYNAME_WITH_SAME_NAME(GroupNext)
 // DEFINE_KEYNAME_WITH_SAME_NAME(GroupPrevious)
 DEFINE_KEYNAME_WITH_SAME_NAME(ModeChange)
 // DEFINE_KEYNAME_WITH_SAME_NAME(NextCandidate)
-DEFINE_KEYNAME_WITH_SAME_NAME(Nonconvert) // Rename to NonConvert
+DEFINE_KEYNAME_WITH_SAME_NAME(NonConvert)
 DEFINE_KEYNAME_WITH_SAME_NAME(PreviousCandidate)
 // DEFINE_KEYNAME_WITH_SAME_NAME(Process)
 // DEFINE_KEYNAME_WITH_SAME_NAME(SingleCandidate)
 
 /******************************************************************************
  * Keys specific to Korean keyboards
  *****************************************************************************/
 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(HalfWidth) // Rename to Hankaku
+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(RomanCharacters) // Rename to Romaji
-DEFINE_KEYNAME_WITH_SAME_NAME(FullWidth) // Rename to Zenkaku
+DEFINE_KEYNAME_WITH_SAME_NAME(Romaji)
+DEFINE_KEYNAME_WITH_SAME_NAME(Zenkaku)
 // DEFINE_KEYNAME_WITH_SAME_NAME(ZenkakuHankaku)
 
 /******************************************************************************
  * General-Purpose Function Keys
  *****************************************************************************/
 DEFINE_KEYNAME_WITH_SAME_NAME(F1)
 DEFINE_KEYNAME_WITH_SAME_NAME(F2)
 DEFINE_KEYNAME_WITH_SAME_NAME(F3)
--- a/widget/NativeKeyToDOMKeyName.h
+++ b/widget/NativeKeyToDOMKeyName.h
@@ -448,21 +448,21 @@ KEY_MAP_ANDROID (Convert, AKEYCODE_HENKA
 
 // FinalMode
 KEY_MAP_WIN     (FinalMode, VK_FINAL)
 
 // ModeChange
 KEY_MAP_WIN     (ModeChange, VK_MODECHANGE)
 KEY_MAP_ANDROID (ModeChange, AKEYCODE_SWITCH_CHARSET)
 
-// Nonconvert
-KEY_MAP_WIN     (Nonconvert, VK_NONCONVERT)
-KEY_MAP_GTK     (Nonconvert, GDK_Muhenkan)
-KEY_MAP_QT      (Nonconvert, Qt::Key_Muhenkan)
-KEY_MAP_ANDROID (Nonconvert, AKEYCODE_MUHENKAN)
+// NonConvert
+KEY_MAP_WIN     (NonConvert, VK_NONCONVERT)
+KEY_MAP_GTK     (NonConvert, GDK_Muhenkan)
+KEY_MAP_QT      (NonConvert, Qt::Key_Muhenkan)
+KEY_MAP_ANDROID (NonConvert, AKEYCODE_MUHENKAN)
 
 // PreviousCandidate
 KEY_MAP_GTK     (PreviousCandidate, GDK_PreviousCandidate) // OADG 109, Mae Koho
 KEY_MAP_QT      (PreviousCandidate, Qt::Key_PreviousCandidate)
 
 /******************************************************************************
  * Keys specific to Korean keyboards
  ******************************************************************************/
@@ -473,20 +473,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
  ******************************************************************************/
-// HalfWidth
-KEY_MAP_WIN_JPN (HalfWidth, VK_OEM_AUTO)
-KEY_MAP_GTK     (HalfWidth, GDK_Hankaku)
-KEY_MAP_QT      (HalfWidth, Qt::Key_Hankaku)
+// 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)
 KEY_MAP_QT      (Hiragana, Qt::Key_Hiragana)
 
 // KanaMode
 // VK_KANA is never used with modern Japanese keyboard, however, IE maps it to
@@ -506,28 +506,28 @@ KEY_MAP_QT      (KanjiMode, Qt::Key_Kanj
 // Assuming that KANA key of Android is the Kana key on Mac keyboard.
 KEY_MAP_ANDROID (KanjiMode, AKEYCODE_KANA)
 
 // Katakana
 KEY_MAP_WIN_JPN (Katakana, VK_OEM_FINISH)
 KEY_MAP_GTK     (Katakana, GDK_Katakana)
 KEY_MAP_QT      (Katakana, Qt::Key_Katakana)
 
-// RomanCharacters
-KEY_MAP_WIN_JPN (RomanCharacters, VK_OEM_BACKTAB)
-KEY_MAP_COCOA   (RomanCharacters, kVK_JIS_Eisu)
-KEY_MAP_GTK     (RomanCharacters, GDK_Romaji)
-KEY_MAP_QT      (RomanCharacters, Qt::Key_Romaji)
+// 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 (RomanCharacters, AKEYCODE_EISU)
+KEY_MAP_ANDROID (Romaji, AKEYCODE_EISU) // XXX Should be "Eisu"
 
-// FullWidth
-KEY_MAP_WIN_JPN (FullWidth, VK_OEM_ENLW)
-KEY_MAP_GTK     (FullWidth, GDK_Zenkaku)
-KEY_MAP_QT      (FullWidth, Qt::Key_Zenkaku)
+// Zenkaku
+KEY_MAP_WIN_JPN (Zenkaku, VK_OEM_ENLW)
+KEY_MAP_GTK     (Zenkaku, GDK_Zenkaku)
+KEY_MAP_QT      (Zenkaku, Qt::Key_Zenkaku)
 
 /******************************************************************************
  * General-Purpose Function Keys
  ******************************************************************************/
 // F1
 KEY_MAP_WIN     (F1, VK_F1)
 KEY_MAP_COCOA   (F1, kVK_F1)
 KEY_MAP_GTK     (F1, GDK_F1)