Bug 1272592 Merge "MediaSelect" key value into "LaunchMediaPlayer" r=smaug
☠☠ backed out by 9acf8466a3f5 ☠ ☠
authorMasayuki Nakano <masayuki@d-toybox.com>
Thu, 19 May 2016 20:47:32 +0900
changeset 298247 3c46096adeaf7611bed1588d6adfa0c7c7b2d5e3
parent 298246 392304ae5264da68fb3e2be789bcbe34137f6951
child 298248 6f15eecb6ba1198798bfbaf34391fd0344d2930c
push id77084
push usermasayuki@d-toybox.com
push dateSat, 21 May 2016 00:12:47 +0000
treeherdermozilla-inbound@3c46096adeaf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs1272592
milestone49.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 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
widget/NativeKeyToDOMKeyName.h
--- a/widget/NativeKeyToDOMKeyName.h
+++ b/widget/NativeKeyToDOMKeyName.h
@@ -1001,20 +1001,23 @@ 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)
 
 // LaunchMusicPlayer
 KEY_MAP_GTK     (LaunchMusicPlayer, GDK_Music)
 KEY_MAP_QT      (LaunchMusicPlayer, Qt::Key_Music)
 KEY_MAP_ANDROID (LaunchMusicPlayer, AKEYCODE_MUSIC)