Bug 939006 part.4 Sort out key names in Editing Keys section r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Wed, 04 Jun 2014 21:43:43 +0900
changeset 206911 4d69c4b463a910790797e73f00dfce3a204d3861
parent 206910 7c2fbf1e5cdff6ca3efd638e750f588176c38fa3
child 206912 6d7575761c43bdcb3271f8a316929d5eaa88a877
push id494
push userraliiev@mozilla.com
push dateMon, 25 Aug 2014 18:42:16 +0000
treeherdermozilla-release@a3cc3e46b571 [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.4 Sort out key names in Editing Keys section r=smaug
dom/events/KeyNameList.h
widget/shared/NativeKeyToDOMKeyName.h
--- a/dom/events/KeyNameList.h
+++ b/dom/events/KeyNameList.h
@@ -63,20 +63,34 @@ DEFINE_KEYNAME_WITH_SAME_NAME(Down) // R
 DEFINE_KEYNAME_WITH_SAME_NAME(Left) // Rename to ArrowLeft
 DEFINE_KEYNAME_WITH_SAME_NAME(Right) // Rename to ArrowRight
 DEFINE_KEYNAME_WITH_SAME_NAME(Up) // Rename to ArrowUp
 DEFINE_KEYNAME_WITH_SAME_NAME(End)
 DEFINE_KEYNAME_WITH_SAME_NAME(Home)
 DEFINE_KEYNAME_WITH_SAME_NAME(PageDown)
 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) // Rename to CrSel
+DEFINE_KEYNAME_WITH_SAME_NAME(Cut)
+DEFINE_KEYNAME_WITH_SAME_NAME(Del) // Rename to Delete
+DEFINE_KEYNAME_WITH_SAME_NAME(EraseEof)
+DEFINE_KEYNAME_WITH_SAME_NAME(Exsel) // Rename to 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)
+
 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)
 DEFINE_KEYNAME_WITH_SAME_NAME(F5)
 DEFINE_KEYNAME_WITH_SAME_NAME(F6)
 DEFINE_KEYNAME_WITH_SAME_NAME(F7)
 DEFINE_KEYNAME_WITH_SAME_NAME(F8)
@@ -158,25 +172,16 @@ DEFINE_KEYNAME_WITH_SAME_NAME(BrowserSea
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserStop)
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserBack)
 DEFINE_KEYNAME_WITH_SAME_NAME(BrowserForward)
 DEFINE_KEYNAME_WITH_SAME_NAME(UpLeft)
 DEFINE_KEYNAME_WITH_SAME_NAME(UpRight)
 DEFINE_KEYNAME_WITH_SAME_NAME(DownLeft)
 DEFINE_KEYNAME_WITH_SAME_NAME(DownRight)
 DEFINE_KEYNAME_WITH_SAME_NAME(Select)
-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)
-DEFINE_KEYNAME_WITH_SAME_NAME(Undo)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadGrave)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadAcute)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadCircumflex)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadTilde)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadMacron)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadBreve)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadAboveDot)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadUmlaut)
--- a/widget/shared/NativeKeyToDOMKeyName.h
+++ b/widget/shared/NativeKeyToDOMKeyName.h
@@ -257,32 +257,84 @@ KEY_MAP_ANDROID (PageDown, AKEYCODE_PAGE
 // PageUp
 KEY_MAP_WIN     (PageUp, VK_PRIOR)
 KEY_MAP_COCOA   (PageUp, kVK_PageUp)
 KEY_MAP_GTK     (PageUp, GDK_Page_Up /* same as GDK_Prior */)
 KEY_MAP_GTK     (PageUp, GDK_KP_Page_Up /* same as GDK_KP_Prior */)
 KEY_MAP_QT      (PageUp, Qt::Key_PageUp)
 KEY_MAP_ANDROID (PageUp, AKEYCODE_PAGE_UP)
 
+/******************************************************************************
+ * Editing Keys
+ ******************************************************************************/
+// 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
+KEY_MAP_WIN     (Clear, VK_CLEAR)
+KEY_MAP_WIN     (Clear, VK_OEM_CLEAR)
+KEY_MAP_COCOA   (Clear, kVK_ANSI_KeypadClear)
+KEY_MAP_GTK     (Clear, GDK_Clear)
+KEY_MAP_QT      (Clear, Qt::Key_Clear)
+KEY_MAP_ANDROID (Clear, AKEYCODE_CLEAR)
+
+// Copy
+KEY_MAP_GTK     (Copy, GDK_Copy)
+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)
+
+// 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
+
+// Insert
+KEY_MAP_WIN     (Insert, VK_INSERT)
+KEY_MAP_GTK     (Insert, GDK_Insert)
+KEY_MAP_GTK     (Insert, GDK_KP_Insert)
+KEY_MAP_QT      (Insert, Qt::Key_Insert)
+KEY_MAP_ANDROID (Insert, AKEYCODE_INSERT)
+
+// Paste
+KEY_MAP_GTK     (Paste, GDK_Paste)
+KEY_MAP_QT      (Paste, Qt::Key_Paste)
+
+// Undo
+KEY_MAP_GTK     (Undo, GDK_Undo)
+
 
 // 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)
 
-// Crsel
-KEY_MAP_WIN     (Crsel, VK_CRSEL)
-KEY_MAP_GTK     (Crsel, GDK_3270_CursorSelect) // legacy IBM keyboard layout
-
-// Exsel
-KEY_MAP_WIN     (Exsel, VK_EXSEL)
-KEY_MAP_GTK     (Exsel, GDK_3270_ExSelect) // legacy IBM keyboard layout
-
 // 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)
 
@@ -709,65 +761,16 @@ KEY_MAP_ANDROID (BrowserForward, AKEYCOD
 // DownLeft
 
 // DownRight
 
 // Select
 KEY_MAP_WIN     (Select, VK_SELECT)
 KEY_MAP_GTK     (Select, GDK_Select)
 
-// 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
-KEY_MAP_WIN     (Clear, VK_CLEAR)
-KEY_MAP_WIN     (Clear, VK_OEM_CLEAR)
-KEY_MAP_COCOA   (Clear, kVK_ANSI_KeypadClear)
-KEY_MAP_GTK     (Clear, GDK_Clear)
-KEY_MAP_QT      (Clear, Qt::Key_Clear)
-KEY_MAP_ANDROID (Clear, AKEYCODE_CLEAR)
-
-// Copy
-KEY_MAP_GTK     (Copy, GDK_Copy)
-KEY_MAP_QT      (Copy, Qt::Key_Copy)
-
-// 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)
-
-// EraseEof
-KEY_MAP_WIN     (EraseEof, VK_EREOF)
-KEY_MAP_GTK     (EraseEof, GDK_3270_EraseEOF) // legacy IBM keyboard layout
-
-// Insert
-KEY_MAP_WIN     (Insert, VK_INSERT)
-KEY_MAP_GTK     (Insert, GDK_Insert)
-KEY_MAP_GTK     (Insert, GDK_KP_Insert)
-KEY_MAP_QT      (Insert, Qt::Key_Insert)
-KEY_MAP_ANDROID (Insert, AKEYCODE_INSERT)
-
-// Paste
-KEY_MAP_GTK     (Paste, GDK_Paste)
-KEY_MAP_QT      (Paste, Qt::Key_Paste)
-
-// Undo
-KEY_MAP_GTK     (Undo, GDK_Undo)
-
 // DeadGrave
 KEY_MAP_GTK     (DeadGrave, GDK_dead_grave)
 KEY_MAP_QT      (DeadGrave, Qt::Key_Dead_Grave)
 
 // DeadAcute
 KEY_MAP_GTK     (DeadAcute, GDK_dead_acute)
 KEY_MAP_QT      (DeadAcute, Qt::Key_Dead_Acute)