Bug 1272592 Merge "MediaSelect" key value into "LaunchMediaPlayer" r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Thu, 19 May 2016 20:47:32 +0900
changeset 324615 4bbdb484d7b89b4ebafbfa4a2ecc28a93ee21157
parent 324614 433e9c41bd91eceff678551a23bc2ee8b771e270
child 324616 818ce263fa38cd7b4883ceea9f4e9ec69e4ae048
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-esr52@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs1272592
milestone49.0a1
Bug 1272592 Merge "MediaSelect" key value into "LaunchMediaPlayer" r=smaug "MediaSelect" is merged into "LanuchMediaPlayer" in the spec since there is no difference between them and "LaunchMediaPlayer" explains the meaning clearer. This patch removes "MediaSelect" key value and maps all keys which are mapped to "MediaSelect" to "LaunchMediaPlayer". MozReview-Commit-ID: IEZhV4p6Qag
dom/events/KeyNameList.h
widget/NativeKeyToDOMKeyName.h
--- a/dom/events/KeyNameList.h
+++ b/dom/events/KeyNameList.h
@@ -265,17 +265,16 @@ DEFINE_KEYNAME_WITH_SAME_NAME(SpeechInpu
 /******************************************************************************
  * Application Keys
  *****************************************************************************/
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchCalculator)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchCalendar)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchContacts)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchMail)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchMediaPlayer)
-DEFINE_KEYNAME_WITH_SAME_NAME(MediaSelect)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchMusicPlayer)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchMyComputer)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchPhone)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchScreenSaver)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchSpreadsheet)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchWebBrowser)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchWebCam)
 DEFINE_KEYNAME_WITH_SAME_NAME(LaunchWordProcessor)
--- a/widget/NativeKeyToDOMKeyName.h
+++ b/widget/NativeKeyToDOMKeyName.h
@@ -1035,29 +1035,27 @@ KEY_MAP_ANDROID (LaunchCalendar, AKEYCOD
 // LaunchMail
 KEY_MAP_WIN     (LaunchMail, VK_LAUNCH_MAIL)
 KEY_MAP_WIN_CMD (LaunchMail, APPCOMMAND_LAUNCH_MAIL)
 KEY_MAP_GTK     (LaunchMail, GDK_Mail)
 KEY_MAP_QT      (LaunchMail, Qt::Key_LaunchMail)
 KEY_MAP_ANDROID (LaunchMail, AKEYCODE_ENVELOPE)
 
 // LaunchMediaPlayer
+KEY_MAP_WIN     (LaunchMediaPlayer, VK_LAUNCH_MEDIA_SELECT)
+KEY_MAP_WIN_CMD (LaunchMediaPlayer, APPCOMMAND_LAUNCH_MEDIA_SELECT)
 // GDK_CD is defined as "Launch CD/DVD player" in XF86keysym.h.
 // Therefore, let's map it to media player rather than music player.
 KEY_MAP_GTK     (LaunchMediaPlayer, GDK_CD)
 KEY_MAP_GTK     (LaunchMediaPlayer, GDK_Video)
+KEY_MAP_GTK     (LaunchMediaPlayer, GDK_AudioMedia)
 KEY_MAP_QT      (LaunchMediaPlayer, Qt::Key_LaunchMedia)
 KEY_MAP_QT      (LaunchMediaPlayer, Qt::Key_CD)
 KEY_MAP_QT      (LaunchMediaPlayer, Qt::Key_Video)
 
-// MediaSelect (should be renamed to LaunchMediaPlayer)
-KEY_MAP_WIN     (MediaSelect, VK_LAUNCH_MEDIA_SELECT)
-KEY_MAP_WIN_CMD (MediaSelect, APPCOMMAND_LAUNCH_MEDIA_SELECT)
-KEY_MAP_GTK     (MediaSelect, GDK_AudioMedia)
-
 // LaunchMusicPlayer
 KEY_MAP_GTK     (LaunchMusicPlayer, GDK_Music)
 KEY_MAP_QT      (LaunchMusicPlayer, Qt::Key_Music)
 KEY_MAP_ANDROID (LaunchMusicPlayer, AKEYCODE_MUSIC)
 
 // LaunchMyComputer
 KEY_MAP_GTK     (LaunchMyComputer, GDK_MyComputer)
 KEY_MAP_GTK     (LaunchMyComputer, GDK_Explorer)