Bug 939006 part.11 Sort out key names in Browser Keys section r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Wed, 04 Jun 2014 21:43:45 +0900
changeset 205834 7751a79c21bf29b5094420b11a0262d6f349989d
parent 205833 1d8d1aa2d7e0123c948be7f738642db872584b26
child 205835 72f432b2f079162e526ff931a27a368997e79dc6
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.11 Sort out key names in Browser Keys section r=smaug
dom/events/KeyNameList.h
widget/shared/NativeKeyToDOMKeyName.h
--- a/dom/events/KeyNameList.h
+++ b/dom/events/KeyNameList.h
@@ -253,28 +253,32 @@ DEFINE_KEYNAME_WITH_SAME_NAME(LaunchAppl
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication12)
 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)
 
+/******************************************************************************
+ * Browser Keys
+ *****************************************************************************/
+DEFINE_KEYNAME_WITH_SAME_NAME(BrowserBack)
+DEFINE_KEYNAME_WITH_SAME_NAME(BrowserFavorites)
+DEFINE_KEYNAME_WITH_SAME_NAME(BrowserForward)
+DEFINE_KEYNAME_WITH_SAME_NAME(BrowserHome)
+DEFINE_KEYNAME_WITH_SAME_NAME(BrowserRefresh)
+DEFINE_KEYNAME_WITH_SAME_NAME(BrowserSearch)
+DEFINE_KEYNAME_WITH_SAME_NAME(BrowserStop)
+
 DEFINE_KEYNAME_WITH_SAME_NAME(Apps)
 DEFINE_KEYNAME_WITH_SAME_NAME(List)
 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)
-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(DeadGrave)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadAcute)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadCircumflex)
 DEFINE_KEYNAME_WITH_SAME_NAME(DeadTilde)
--- a/widget/shared/NativeKeyToDOMKeyName.h
+++ b/widget/shared/NativeKeyToDOMKeyName.h
@@ -853,37 +853,36 @@ KEY_MAP_GTK     (LaunchApplication16, GD
 KEY_MAP_QT      (LaunchApplication16, Qt::Key_LaunchF)
 
 // LaunchApplication17
 KEY_MAP_QT      (LaunchApplication17, Qt::Key_LaunchG)
 
 // LaunchApplication18
 KEY_MAP_QT      (LaunchApplication18, Qt::Key_LaunchH)
 
-
-// Apps
-KEY_MAP_ANDROID (Apps, AKEYCODE_APP_SWITCH)
-
-// List
-
-// Info
-KEY_MAP_ANDROID (Info, AKEYCODE_INFO)
-
-// Exit
-KEY_MAP_ANDROID (Exit, AKEYCODE_HOME)
-
-// Zoom
-KEY_MAP_WIN     (Zoom, VK_ZOOM)
-KEY_MAP_QT      (Zoom, Qt::Key_Zoom)
+/******************************************************************************
+ * Browser Keys
+ ******************************************************************************/
+// BrowserBack
+KEY_MAP_WIN     (BrowserBack, VK_BROWSER_BACK)
+KEY_MAP_GTK     (BrowserBack, GDK_Back)
+KEY_MAP_QT      (BrowserBack, Qt::Key_Back)
+KEY_MAP_ANDROID (BrowserBack, AKEYCODE_BACK)
 
 // BrowserFavorites
 KEY_MAP_WIN     (BrowserFavorites, VK_BROWSER_FAVORITES)
 KEY_MAP_QT      (BrowserFavorites, Qt::Key_Favorites)
 KEY_MAP_ANDROID (BrowserFavorites, AKEYCODE_BOOKMARK)
 
+// BrowserForward
+KEY_MAP_WIN     (BrowserForward, VK_BROWSER_FORWARD)
+KEY_MAP_GTK     (BrowserForward, GDK_Forward)
+KEY_MAP_QT      (BrowserForward, Qt::Key_Forward)
+KEY_MAP_ANDROID (BrowserForward, AKEYCODE_FORWARD)
+
 // BrowserHome
 KEY_MAP_WIN     (BrowserHome, VK_BROWSER_HOME)
 KEY_MAP_GTK     (BrowserHome, GDK_HomePage)
 KEY_MAP_QT      (BrowserHome, Qt::Key_HomePage)
 
 // BrowserRefresh
 KEY_MAP_WIN     (BrowserRefresh, VK_BROWSER_REFRESH)
 KEY_MAP_GTK     (BrowserRefresh, GDK_Refresh)
@@ -897,27 +896,31 @@ KEY_MAP_GTK     (BrowserSearch, GDK_Sear
 KEY_MAP_QT      (BrowserSearch, Qt::Key_Search)
 KEY_MAP_ANDROID (BrowserSearch, AKEYCODE_SEARCH)
 
 // BrowserStop
 KEY_MAP_WIN     (BrowserStop, VK_BROWSER_STOP)
 KEY_MAP_GTK     (BrowserStop, GDK_Stop)
 KEY_MAP_QT      (BrowserStop, Qt::Key_Stop)
 
-// BrowserBack
-KEY_MAP_WIN     (BrowserBack, VK_BROWSER_BACK)
-KEY_MAP_GTK     (BrowserBack, GDK_Back)
-KEY_MAP_QT      (BrowserBack, Qt::Key_Back)
-KEY_MAP_ANDROID (BrowserBack, AKEYCODE_BACK)
+
+// Apps
+KEY_MAP_ANDROID (Apps, AKEYCODE_APP_SWITCH)
+
+// List
 
-// BrowserForward
-KEY_MAP_WIN     (BrowserForward, VK_BROWSER_FORWARD)
-KEY_MAP_GTK     (BrowserForward, GDK_Forward)
-KEY_MAP_QT      (BrowserForward, Qt::Key_Forward)
-KEY_MAP_ANDROID (BrowserForward, AKEYCODE_FORWARD)
+// Info
+KEY_MAP_ANDROID (Info, AKEYCODE_INFO)
+
+// Exit
+KEY_MAP_ANDROID (Exit, AKEYCODE_HOME)
+
+// Zoom
+KEY_MAP_WIN     (Zoom, VK_ZOOM)
+KEY_MAP_QT      (Zoom, Qt::Key_Zoom)
 
 // UpLeft
 
 // UpRight
 
 // DownLeft
 
 // DownRight