Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1272592 Merge "MediaSelect" key value into "LaunchMediaPlayer" r=smaug

Browse Source 
"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
This commit is contained in:
Masayuki Nakano 2016-05-19 20:47:32 +09:00
parent d72061929f
commit 02cb827ee5
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/events/KeyNameList.h
View File

@ -270,7 +270,6 @@ 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)

8
widget/NativeKeyToDOMKeyName.h
View File

@ -1040,19 +1040,17 @@ 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)