Bug 900374 Rename 'Menu' key value to 'ContextMenu' r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Tue, 30 Dec 2014 10:47:53 +0900
changeset 221569 a3e3285c280c2c53a8cb143aefb018fdbf940b52
parent 221568 892cea1c2efcd672d91b3cf2a0fc500f14513e12
child 221570 d119b6978a9f59c1cf119496a048cf2bd25262d7
push id53376
push usermasayuki@d-toybox.com
push dateTue, 30 Dec 2014 01:48:05 +0000
treeherdermozilla-inbound@f1fb6e0260a8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs900374
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 900374 Rename 'Menu' key value to 'ContextMenu' r=smaug
dom/events/KeyNameList.h
widget/NativeKeyToDOMKeyName.h
--- a/dom/events/KeyNameList.h
+++ b/dom/events/KeyNameList.h
@@ -86,17 +86,17 @@ DEFINE_KEYNAME_WITH_SAME_NAME(Undo)
 
 /******************************************************************************
  * UI Keys
  *****************************************************************************/
 DEFINE_KEYNAME_WITH_SAME_NAME(Accept)
 // DEFINE_KEYNAME_WITH_SAME_NAME(Again)
 DEFINE_KEYNAME_WITH_SAME_NAME(Attn)
 DEFINE_KEYNAME_WITH_SAME_NAME(Cancel)
-DEFINE_KEYNAME_WITH_SAME_NAME(Menu) // Rename to ContextMenu
+DEFINE_KEYNAME_WITH_SAME_NAME(ContextMenu)
 DEFINE_KEYNAME_WITH_SAME_NAME(Esc) // Rename to Escape
 DEFINE_KEYNAME_WITH_SAME_NAME(Execute)
 DEFINE_KEYNAME_WITH_SAME_NAME(Find)
 DEFINE_KEYNAME_WITH_SAME_NAME(Help)
 DEFINE_KEYNAME_WITH_SAME_NAME(Pause)
 DEFINE_KEYNAME_WITH_SAME_NAME(Play)
 // DEFINE_KEYNAME_WITH_SAME_NAME(Props)
 DEFINE_KEYNAME_WITH_SAME_NAME(Select)
--- a/widget/NativeKeyToDOMKeyName.h
+++ b/widget/NativeKeyToDOMKeyName.h
@@ -333,22 +333,22 @@ KEY_MAP_ANDROID (Accept, AKEYCODE_DPAD_C
 KEY_MAP_WIN_OTH (Attn, VK_ATTN) // not valid with Japanese keyboard layout
 KEY_MAP_GTK     (Attn, GDK_3270_Attn) // legacy IBM keyboard layout
 
 // Cancel
 KEY_MAP_WIN     (Cancel, VK_CANCEL)
 KEY_MAP_GTK     (Cancel, GDK_Cancel)
 KEY_MAP_QT      (Cancel, Qt::Key_Cancel)
 
-// Menu
-KEY_MAP_WIN     (Menu, VK_APPS)
-KEY_MAP_COCOA   (Menu, kVK_PC_ContextMenu)
-KEY_MAP_GTK     (Menu, GDK_Menu)
-KEY_MAP_QT      (Menu, Qt::Key_Menu)
-KEY_MAP_ANDROID (Menu, AKEYCODE_MENU)
+// ContextMenu
+KEY_MAP_WIN     (ContextMenu, VK_APPS)
+KEY_MAP_COCOA   (ContextMenu, kVK_PC_ContextMenu)
+KEY_MAP_GTK     (ContextMenu, GDK_Menu)
+KEY_MAP_QT      (ContextMenu, Qt::Key_Menu)
+KEY_MAP_ANDROID (ContextMenu, AKEYCODE_MENU)
 
 // Esc
 KEY_MAP_WIN     (Esc, VK_ESCAPE)
 KEY_MAP_COCOA   (Esc, kVK_Escape)
 KEY_MAP_GTK     (Esc, GDK_Escape)
 KEY_MAP_QT      (Esc, Qt::Key_Escape)
 KEY_MAP_ANDROID (Esc, AKEYCODE_ESCAPE)