Bug 939006 part.2 Sort out key names in Whitespace Keys section r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Wed, 04 Jun 2014 21:43:42 +0900
changeset 205825 ce6205f6d94a854d37a6ac95be75945cc64a7f09
parent 205824 ed539e06f5c0c9f00b83f90a238b403b8a83b3ea
child 205826 7c2fbf1e5cdff6ca3efd638e750f588176c38fa3
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.2 Sort out key names in Whitespace Keys section r=smaug
dom/events/KeyNameList.h
widget/shared/NativeKeyToDOMKeyName.h
--- a/dom/events/KeyNameList.h
+++ b/dom/events/KeyNameList.h
@@ -44,16 +44,23 @@ DEFINE_KEYNAME_WITH_SAME_NAME(Meta)
 DEFINE_KEYNAME_WITH_SAME_NAME(NumLock)
 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(SymbolLock)
 
+/******************************************************************************
+ * Whitespace Keys
+ *****************************************************************************/
+DEFINE_KEYNAME_WITH_SAME_NAME(Enter)
+// DEFINE_KEYNAME_WITH_SAME_NAME(Separator)
+DEFINE_KEYNAME_WITH_SAME_NAME(Tab)
+
 DEFINE_KEYNAME_WITH_SAME_NAME(Attn)
 DEFINE_KEYNAME_WITH_SAME_NAME(Apps)
 DEFINE_KEYNAME_WITH_SAME_NAME(Crsel)
 DEFINE_KEYNAME_WITH_SAME_NAME(Exsel)
 DEFINE_KEYNAME_WITH_SAME_NAME(F1)
 DEFINE_KEYNAME_WITH_SAME_NAME(F2)
 DEFINE_KEYNAME_WITH_SAME_NAME(F3)
 DEFINE_KEYNAME_WITH_SAME_NAME(F4)
@@ -110,17 +117,16 @@ DEFINE_KEYNAME_WITH_SAME_NAME(LaunchMail
 DEFINE_KEYNAME_WITH_SAME_NAME(List)
 DEFINE_KEYNAME_WITH_SAME_NAME(Props)
 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(Accept)
 DEFINE_KEYNAME_WITH_SAME_NAME(Again)
-DEFINE_KEYNAME_WITH_SAME_NAME(Enter)
 DEFINE_KEYNAME_WITH_SAME_NAME(Find)
 DEFINE_KEYNAME_WITH_SAME_NAME(Help)
 DEFINE_KEYNAME_WITH_SAME_NAME(Info)
 DEFINE_KEYNAME_WITH_SAME_NAME(Menu)
 DEFINE_KEYNAME_WITH_SAME_NAME(Pause)
 DEFINE_KEYNAME_WITH_SAME_NAME(Play)
 DEFINE_KEYNAME_WITH_SAME_NAME(Execute)
 DEFINE_KEYNAME_WITH_SAME_NAME(Cancel)
@@ -148,17 +154,16 @@ DEFINE_KEYNAME_WITH_SAME_NAME(Up)
 DEFINE_KEYNAME_WITH_SAME_NAME(UpLeft)
 DEFINE_KEYNAME_WITH_SAME_NAME(UpRight)
 DEFINE_KEYNAME_WITH_SAME_NAME(Down)
 DEFINE_KEYNAME_WITH_SAME_NAME(DownLeft)
 DEFINE_KEYNAME_WITH_SAME_NAME(DownRight)
 DEFINE_KEYNAME_WITH_SAME_NAME(Home)
 DEFINE_KEYNAME_WITH_SAME_NAME(End)
 DEFINE_KEYNAME_WITH_SAME_NAME(Select)
-DEFINE_KEYNAME_WITH_SAME_NAME(Tab)
 DEFINE_KEYNAME_WITH_SAME_NAME(Backspace)
 DEFINE_KEYNAME_WITH_SAME_NAME(Clear)
 DEFINE_KEYNAME_WITH_SAME_NAME(Copy)
 DEFINE_KEYNAME_WITH_SAME_NAME(Cut)
 DEFINE_KEYNAME_WITH_SAME_NAME(Del)
 DEFINE_KEYNAME_WITH_SAME_NAME(EraseEof)
 DEFINE_KEYNAME_WITH_SAME_NAME(Insert)
 DEFINE_KEYNAME_WITH_SAME_NAME(Paste)
--- a/widget/shared/NativeKeyToDOMKeyName.h
+++ b/widget/shared/NativeKeyToDOMKeyName.h
@@ -165,16 +165,41 @@ KEY_MAP_COCOA   (Shift, kVK_Shift)
 KEY_MAP_COCOA   (Shift, kVK_RightShift)
 KEY_MAP_GTK     (Shift, GDK_Shift_L)
 KEY_MAP_GTK     (Shift, GDK_Shift_R)
 KEY_MAP_GTK     (Shift, GDK_Shift_Lock) // Let's treat as Shift key (bug 769159)
 KEY_MAP_QT      (Shift, Qt::Key_Shift)
 KEY_MAP_ANDROID (Shift, AKEYCODE_SHIFT_LEFT)
 KEY_MAP_ANDROID (Shift, AKEYCODE_SHIFT_RIGHT)
 
+/******************************************************************************
+ * Whitespace Keys
+ ******************************************************************************/
+// Enter
+KEY_MAP_WIN     (Enter, VK_RETURN)
+KEY_MAP_COCOA   (Enter, kVK_Return)
+KEY_MAP_COCOA   (Enter, kVK_ANSI_KeypadEnter)
+KEY_MAP_COCOA   (Enter, kVK_Powerbook_KeypadEnter)
+KEY_MAP_GTK     (Enter, GDK_Return)
+KEY_MAP_GTK     (Enter, GDK_KP_Enter)
+KEY_MAP_GTK     (Enter, GDK_ISO_Enter)
+KEY_MAP_GTK     (Enter, GDK_3270_Enter)
+KEY_MAP_QT      (Enter, Qt::Key_Return)
+KEY_MAP_QT      (Enter, Qt::Key_Enter)
+KEY_MAP_ANDROID (Enter, AKEYCODE_ENTER)
+KEY_MAP_ANDROID (Enter, AKEYCODE_NUMPAD_ENTER)
+
+// Tab
+KEY_MAP_WIN     (Tab, VK_TAB)
+KEY_MAP_COCOA   (Tab, kVK_Tab)
+KEY_MAP_GTK     (Tab, GDK_Tab)
+KEY_MAP_GTK     (Tab, GDK_KP_Tab)
+KEY_MAP_QT      (Tab, Qt::Key_Tab)
+KEY_MAP_ANDROID (Tab, AKEYCODE_TAB)
+
 
 // Attn
 KEY_MAP_WIN_OTH (Attn, VK_ATTN) // not valid with Japanese keyboard layout
 KEY_MAP_GTK     (Attn, GDK_3270_Attn) // legacy IBM keyboard layout
 
 // Apps
 KEY_MAP_ANDROID (Apps, AKEYCODE_APP_SWITCH)
 
@@ -477,30 +502,16 @@ KEY_MAP_ANDROID (LaunchMail, AKEYCODE_EN
 // Soft4
 
 // Accept
 KEY_MAP_WIN     (Accept, VK_ACCEPT)
 KEY_MAP_ANDROID (Accept, AKEYCODE_DPAD_CENTER)
 
 // Again
 
-// Enter
-KEY_MAP_WIN     (Enter, VK_RETURN)
-KEY_MAP_COCOA   (Enter, kVK_Return)
-KEY_MAP_COCOA   (Enter, kVK_ANSI_KeypadEnter)
-KEY_MAP_COCOA   (Enter, kVK_Powerbook_KeypadEnter)
-KEY_MAP_GTK     (Enter, GDK_Return)
-KEY_MAP_GTK     (Enter, GDK_KP_Enter)
-KEY_MAP_GTK     (Enter, GDK_ISO_Enter)
-KEY_MAP_GTK     (Enter, GDK_3270_Enter)
-KEY_MAP_QT      (Enter, Qt::Key_Return)
-KEY_MAP_QT      (Enter, Qt::Key_Enter)
-KEY_MAP_ANDROID (Enter, AKEYCODE_ENTER)
-KEY_MAP_ANDROID (Enter, AKEYCODE_NUMPAD_ENTER)
-
 // Find
 KEY_MAP_GTK     (Find, GDK_Find)
 
 // Help
 KEY_MAP_WIN     (Help, VK_HELP)
 KEY_MAP_COCOA   (Help, kVK_Help)
 KEY_MAP_GTK     (Help, GDK_Help)
 KEY_MAP_QT      (Help, Qt::Key_Help)
@@ -695,24 +706,16 @@ KEY_MAP_GTK     (End, GDK_End)
 KEY_MAP_GTK     (End, GDK_KP_End)
 KEY_MAP_QT      (End, Qt::Key_End)
 KEY_MAP_ANDROID (End, AKEYCODE_MOVE_END)
 
 // Select
 KEY_MAP_WIN     (Select, VK_SELECT)
 KEY_MAP_GTK     (Select, GDK_Select)
 
-// Tab
-KEY_MAP_WIN     (Tab, VK_TAB)
-KEY_MAP_COCOA   (Tab, kVK_Tab)
-KEY_MAP_GTK     (Tab, GDK_Tab)
-KEY_MAP_GTK     (Tab, GDK_KP_Tab)
-KEY_MAP_QT      (Tab, Qt::Key_Tab)
-KEY_MAP_ANDROID (Tab, AKEYCODE_TAB)
-
 // Backspace
 KEY_MAP_WIN     (Backspace, VK_BACK)
 KEY_MAP_COCOA   (Backspace, kVK_PC_Backspace)
 KEY_MAP_GTK     (Backspace, GDK_BackSpace)
 KEY_MAP_QT      (Backspace, Qt::Key_Backspace)
 KEY_MAP_ANDROID (Backspace, AKEYCODE_DEL)
 
 // Clear