Bug 1274503 part.0 Move "MediaFastForward" to "Media Keys" section for keeping same order with the spec r?smaug
MozReview-Commit-ID: 4eGNIDmbPds
--- a/dom/events/KeyNameList.h
+++ b/dom/events/KeyNameList.h
@@ -211,16 +211,17 @@ DEFINE_KEYNAME_WITH_SAME_NAME(Soft4)
* Multimedia Keys
*****************************************************************************/
DEFINE_KEYNAME_WITH_SAME_NAME(ChannelDown)
DEFINE_KEYNAME_WITH_SAME_NAME(ChannelUp)
DEFINE_KEYNAME_WITH_SAME_NAME(Close)
DEFINE_KEYNAME_WITH_SAME_NAME(MailForward)
DEFINE_KEYNAME_WITH_SAME_NAME(MailReply)
DEFINE_KEYNAME_WITH_SAME_NAME(MailSend)
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaFastForward)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaPause)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaPlay)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaPlayPause)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaRecord)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaRewind)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaStop)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaTrackNext)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaTrackPrevious)
@@ -395,17 +396,16 @@ DEFINE_KEYNAME_WITH_SAME_NAME(GuidePrevi
DEFINE_KEYNAME_WITH_SAME_NAME(Info)
DEFINE_KEYNAME_WITH_SAME_NAME(InstantReplay)
DEFINE_KEYNAME_WITH_SAME_NAME(Link)
DEFINE_KEYNAME_WITH_SAME_NAME(ListProgram)
DEFINE_KEYNAME_WITH_SAME_NAME(LiveContent)
DEFINE_KEYNAME_WITH_SAME_NAME(Lock)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaApps)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaAudioTrack)
-DEFINE_KEYNAME_WITH_SAME_NAME(MediaFastForward)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaLast)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaSkipBackward)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaSkipForward)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaStepBackward)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaStepForward)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaTopMenu)
DEFINE_KEYNAME_WITH_SAME_NAME(NavigateIn)
DEFINE_KEYNAME_WITH_SAME_NAME(NavigateNext)
--- a/widget/NativeKeyToDOMKeyName.h
+++ b/widget/NativeKeyToDOMKeyName.h
@@ -783,16 +783,21 @@ KEY_MAP_GTK (MailForward, GDK_MailFo
// MailReply
KEY_MAP_WIN_CMD (MailReply, APPCOMMAND_REPLY_TO_MAIL)
KEY_MAP_GTK (MailReply, GDK_Reply)
// MailSend
KEY_MAP_WIN_CMD (MailSend, APPCOMMAND_SEND_MAIL)
KEY_MAP_GTK (MailSend, GDK_Send)
+// MediaFastForward
+KEY_MAP_WIN_CMD (MediaFastForward, APPCOMMAND_MEDIA_FAST_FORWARD)
+KEY_MAP_GTK (MediaFastForward, GDK_AudioForward)
+KEY_MAP_ANDROID (MediaFastForward, AKEYCODE_MEDIA_FAST_FORWARD)
+
// MediaPause
KEY_MAP_WIN_CMD (MediaPause, APPCOMMAND_MEDIA_PAUSE)
KEY_MAP_GTK (MediaPause, GDK_AudioPause)
KEY_MAP_ANDROID (MediaPause, AKEYCODE_MEDIA_PAUSE)
// MediaPlay
KEY_MAP_WIN_CMD (MediaPlay, APPCOMMAND_MEDIA_PLAY)
KEY_MAP_GTK (MediaPlay, GDK_AudioPlay)
@@ -1085,21 +1090,16 @@ KEY_MAP_ANDROID (ColorF3Blue, AKEYCODE_P
KEY_MAP_GTK (Dimmer, GDK_BrightnessAdjust)
// Guide
KEY_MAP_ANDROID (Guide, AKEYCODE_GUIDE)
// Info
KEY_MAP_ANDROID (Info, AKEYCODE_INFO)
-// MediaFastForward
-KEY_MAP_WIN_CMD (MediaFastForward, APPCOMMAND_MEDIA_FAST_FORWARD)
-KEY_MAP_GTK (MediaFastForward, GDK_AudioForward)
-KEY_MAP_ANDROID (MediaFastForward, AKEYCODE_MEDIA_FAST_FORWARD)
-
// MediaLast
// PinPToggle
KEY_MAP_ANDROID (PinPToggle, AKEYCODE_WINDOW)
// RandomToggle
KEY_MAP_GTK (RandomToggle, GDK_AudioRandomPlay)