Bug 912859 Rename 'Del' and 'Esc' key values to 'Delete' and 'Escape' r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Tue, 30 Dec 2014 10:47:53 +0900
changeset 249127 f9e3557d56f88865a9ac2eba1ec561a6f49929aa
parent 249126 b31f5e69fa20192ed8445d5993014ea73b4260f5
child 249128 f2e8c554b395e2346e8dde4115bb66f1b693bff0
push id698
push userjlund@mozilla.com
push dateMon, 23 Mar 2015 22:08:11 +0000
treeherdermozilla-release@b0c0ae7b02a3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs912859
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 912859 Rename 'Del' and 'Esc' key values to 'Delete' and 'Escape' r=smaug
dom/events/KeyNameList.h
widget/NativeKeyToDOMKeyName.h
--- a/dom/events/KeyNameList.h
+++ b/dom/events/KeyNameList.h
@@ -71,33 +71,33 @@ DEFINE_KEYNAME_WITH_SAME_NAME(PageUp)
 /******************************************************************************
  * Editing Keys
  *****************************************************************************/
 DEFINE_KEYNAME_WITH_SAME_NAME(Backspace)
 DEFINE_KEYNAME_WITH_SAME_NAME(Clear)
 DEFINE_KEYNAME_WITH_SAME_NAME(Copy)
 DEFINE_KEYNAME_WITH_SAME_NAME(CrSel)
 DEFINE_KEYNAME_WITH_SAME_NAME(Cut)
-DEFINE_KEYNAME_WITH_SAME_NAME(Del) // Rename to Delete
+DEFINE_KEYNAME_WITH_SAME_NAME(Delete)
 DEFINE_KEYNAME_WITH_SAME_NAME(EraseEof)
 DEFINE_KEYNAME_WITH_SAME_NAME(ExSel)
 DEFINE_KEYNAME_WITH_SAME_NAME(Insert)
 DEFINE_KEYNAME_WITH_SAME_NAME(Paste)
 // DEFINE_KEYNAME_WITH_SAME_NAME(Redo)
 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(ContextMenu)
-DEFINE_KEYNAME_WITH_SAME_NAME(Esc) // Rename to Escape
+DEFINE_KEYNAME_WITH_SAME_NAME(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)
 // DEFINE_KEYNAME_WITH_SAME_NAME(ZoomIn)
--- a/widget/NativeKeyToDOMKeyName.h
+++ b/widget/NativeKeyToDOMKeyName.h
@@ -287,23 +287,23 @@ KEY_MAP_QT      (Copy, Qt::Key_Copy)
 // CrSel
 KEY_MAP_WIN     (CrSel, VK_CRSEL)
 KEY_MAP_GTK     (CrSel, GDK_3270_CursorSelect) // legacy IBM keyboard layout
 
 // Cut
 KEY_MAP_GTK     (Cut, GDK_Cut)
 KEY_MAP_QT      (Cut, Qt::Key_Cut)
 
-// Del
-KEY_MAP_WIN     (Del, VK_DELETE)
-KEY_MAP_COCOA   (Del, kVK_PC_Delete)
-KEY_MAP_GTK     (Del, GDK_Delete)
-KEY_MAP_GTK     (Del, GDK_KP_Delete)
-KEY_MAP_QT      (Del, Qt::Key_Delete)
-KEY_MAP_ANDROID (Del, AKEYCODE_FORWARD_DEL)
+// Delete
+KEY_MAP_WIN     (Delete, VK_DELETE)
+KEY_MAP_COCOA   (Delete, kVK_PC_Delete)
+KEY_MAP_GTK     (Delete, GDK_Delete)
+KEY_MAP_GTK     (Delete, GDK_KP_Delete)
+KEY_MAP_QT      (Delete, Qt::Key_Delete)
+KEY_MAP_ANDROID (Delete, AKEYCODE_FORWARD_DEL)
 
 // EraseEof
 KEY_MAP_WIN     (EraseEof, VK_EREOF)
 KEY_MAP_GTK     (EraseEof, GDK_3270_EraseEOF) // legacy IBM keyboard layout
 
 // ExSel
 KEY_MAP_WIN     (ExSel, VK_EXSEL)
 KEY_MAP_GTK     (ExSel, GDK_3270_ExSelect) // legacy IBM keyboard layout
@@ -340,22 +340,22 @@ KEY_MAP_QT      (Cancel, Qt::Key_Cancel)
 
 // 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)
+// Escape
+KEY_MAP_WIN     (Escape, VK_ESCAPE)
+KEY_MAP_COCOA   (Escape, kVK_Escape)
+KEY_MAP_GTK     (Escape, GDK_Escape)
+KEY_MAP_QT      (Escape, Qt::Key_Escape)
+KEY_MAP_ANDROID (Escape, AKEYCODE_ESCAPE)
 
 // Execute
 KEY_MAP_WIN     (Execute, VK_EXECUTE)
 KEY_MAP_GTK     (Execute, GDK_Execute)
 KEY_MAP_QT      (Execute, Qt::Key_Execute)
 
 // Find
 KEY_MAP_GTK     (Find, GDK_Find)