Bug 939006 part.8 Sort out key names in General-Purpose Function Keys section r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Wed, 04 Jun 2014 21:43:44 +0900
changeset 205831 749cca6fcb0570b16b1d5aab92ef9bbefc2d7f0b
parent 205830 385ba5d17d1678bd127dc5f4971f9e912d88524a
child 205832 d8a5caee34634eaa117c992a24cb364ae9549adf
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs939006
milestone32.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 939006 part.8 Sort out key names in General-Purpose Function Keys section r=smaug
dom/events/KeyNameList.h
widget/shared/NativeKeyToDOMKeyName.h
--- a/dom/events/KeyNameList.h
+++ b/dom/events/KeyNameList.h
@@ -155,17 +155,19 @@ 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(ZenkakuHankaku)
 
-DEFINE_KEYNAME_WITH_SAME_NAME(Apps)
+/******************************************************************************
+ * General-Purpose Function Keys
+ *****************************************************************************/
 DEFINE_KEYNAME_WITH_SAME_NAME(F1)
 DEFINE_KEYNAME_WITH_SAME_NAME(F2)
 DEFINE_KEYNAME_WITH_SAME_NAME(F3)
 DEFINE_KEYNAME_WITH_SAME_NAME(F4)
 DEFINE_KEYNAME_WITH_SAME_NAME(F5)
 DEFINE_KEYNAME_WITH_SAME_NAME(F6)
 DEFINE_KEYNAME_WITH_SAME_NAME(F7)
 DEFINE_KEYNAME_WITH_SAME_NAME(F8)
@@ -191,16 +193,22 @@ DEFINE_KEYNAME_WITH_SAME_NAME(F27)
 DEFINE_KEYNAME_WITH_SAME_NAME(F28)
 DEFINE_KEYNAME_WITH_SAME_NAME(F29)
 DEFINE_KEYNAME_WITH_SAME_NAME(F30)
 DEFINE_KEYNAME_WITH_SAME_NAME(F31)
 DEFINE_KEYNAME_WITH_SAME_NAME(F32)
 DEFINE_KEYNAME_WITH_SAME_NAME(F33)
 DEFINE_KEYNAME_WITH_SAME_NAME(F34)
 DEFINE_KEYNAME_WITH_SAME_NAME(F35)
+// DEFINE_KEYNAME_WITH_SAME_NAME(Soft1)
+// DEFINE_KEYNAME_WITH_SAME_NAME(Soft2)
+// DEFINE_KEYNAME_WITH_SAME_NAME(Soft3)
+// DEFINE_KEYNAME_WITH_SAME_NAME(Soft4)
+
+DEFINE_KEYNAME_WITH_SAME_NAME(Apps)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication1)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication2)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication3)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication4)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication5)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication6)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication7)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication8)
@@ -211,20 +219,16 @@ DEFINE_KEYNAME_WITH_SAME_NAME(LaunchAppl
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication13)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication14)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication15)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication16)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication17)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication18)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchMail)
 DEFINE_KEYNAME_WITH_SAME_NAME(List)
-DEFINE_KEYNAME_WITH_SAME_NAME(Soft1)
-DEFINE_KEYNAME_WITH_SAME_NAME(Soft2)
-DEFINE_KEYNAME_WITH_SAME_NAME(Soft3)
-DEFINE_KEYNAME_WITH_SAME_NAME(Soft4)
 DEFINE_KEYNAME_WITH_SAME_NAME(Info)
 DEFINE_KEYNAME_WITH_SAME_NAME(Exit)
 DEFINE_KEYNAME_WITH_SAME_NAME(Zoom)
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserFavorites)
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserHome)
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserRefresh)
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserSearch)
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserStop)
--- a/widget/shared/NativeKeyToDOMKeyName.h
+++ b/widget/shared/NativeKeyToDOMKeyName.h
@@ -519,20 +519,19 @@ KEY_MAP_QT      (RomanCharacters, Qt::Ke
 // Assuming that EISU key of Android is the Eisu key on Mac keyboard.
 KEY_MAP_ANDROID (RomanCharacters, AKEYCODE_EISU)
 
 // FullWidth
 KEY_MAP_WIN_JPN (FullWidth, VK_OEM_ENLW)
 KEY_MAP_GTK     (FullWidth, GDK_Zenkaku)
 KEY_MAP_QT      (FullWidth, Qt::Key_Zenkaku)
 
-
-// Apps
-KEY_MAP_ANDROID (Apps, AKEYCODE_APP_SWITCH)
-
+/******************************************************************************
+ * General-Purpose Function Keys
+ ******************************************************************************/
 // F1
 KEY_MAP_WIN     (F1, VK_F1)
 KEY_MAP_COCOA   (F1, kVK_F1)
 KEY_MAP_GTK     (F1, GDK_F1)
 KEY_MAP_GTK     (F1, GDK_KP_F1)
 KEY_MAP_QT      (F1, Qt::Key_F1)
 KEY_MAP_ANDROID (F1, AKEYCODE_F1)
 
@@ -722,16 +721,20 @@ KEY_MAP_QT      (F33, Qt::Key_F33)
 // F34
 KEY_MAP_GTK     (F34, GDK_F34 /* same as GDK_R14 */)
 KEY_MAP_QT      (F34, Qt::Key_F34)
 
 // F35
 KEY_MAP_GTK     (F35, GDK_F35 /* same as GDK_R15 */)
 KEY_MAP_QT      (F35, Qt::Key_F35)
 
+
+// Apps
+KEY_MAP_ANDROID (Apps, AKEYCODE_APP_SWITCH)
+
 // LaunchApplication1
 KEY_MAP_WIN     (LaunchApplication1, VK_LAUNCH_APP1)
 KEY_MAP_GTK     (LaunchApplication1, GDK_Launch0)
 KEY_MAP_QT      (LaunchApplication1, Qt::Key_Launch0)
 KEY_MAP_ANDROID (LaunchApplication1, AKEYCODE_EXPLORER)
 
 // LaunchApplication2
 KEY_MAP_WIN     (LaunchApplication2, VK_LAUNCH_APP2)
@@ -803,24 +806,16 @@ KEY_MAP_QT      (LaunchApplication18, Qt
 // LaunchMail
 KEY_MAP_WIN     (LaunchMail, VK_LAUNCH_MAIL)
 KEY_MAP_GTK     (LaunchMail, GDK_Mail)
 KEY_MAP_QT      (LaunchMail, Qt::Key_LaunchMail)
 KEY_MAP_ANDROID (LaunchMail, AKEYCODE_ENVELOPE)
 
 // List
 
-// Soft1
-
-// Soft2
-
-// Soft3
-
-// Soft4
-
 // Info
 KEY_MAP_ANDROID (Info, AKEYCODE_INFO)
 
 // Exit
 KEY_MAP_ANDROID (Exit, AKEYCODE_HOME)
 
 // Zoom
 KEY_MAP_WIN     (Zoom, VK_ZOOM)