Bug 912864 Rename 'SelectMedia', 'MediaNextTrack' and 'MediaPreviousTrack' to 'MediaSelect', 'MediaTrackNext' and 'MediaTrackPrevious' r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Tue, 30 Dec 2014 10:47:53 +0900
changeset 221608 607e30d0189fbda4ad403e6917fff6c7b72d4ab2
parent 221607 f2e8c554b395e2346e8dde4115bb66f1b693bff0
child 221609 fbfc02e1c647a2c1c73c6de81614700cdc508d93
push id28035
push userkwierso@gmail.com
push dateTue, 30 Dec 2014 23:48:17 +0000
treeherdermozilla-central@88037f94b7d7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs912864
milestone37.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 912864 Rename 'SelectMedia', 'MediaNextTrack' and 'MediaPreviousTrack' to 'MediaSelect', 'MediaTrackNext' and 'MediaTrackPrevious' r=smaug
b2g/chrome/content/shell.js
dom/events/KeyNameList.h
widget/NativeKeyToDOMKeyName.h
--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@@ -393,18 +393,18 @@ var shell = {
         type = 'menu-button';
         break;
       case evt.DOM_VK_F1: // headset button
         type = 'headset-button';
         break;
     }
 
     let mediaKeys = {
-      'MediaNextTrack': 'media-next-track-button',
-      'MediaPreviousTrack': 'media-previous-track-button',
+      'MediaTrackNext': 'media-next-track-button',
+      'MediaTrackPrevious': 'media-previous-track-button',
       'MediaPause': 'media-pause-button',
       'MediaPlay': 'media-play-button',
       'MediaPlayPause': 'media-play-pause-button',
       'MediaStop': 'media-stop-button',
       'MediaRewind': 'media-rewind-button',
       'FastFwd': 'media-fast-forward-button'
     };
 
--- a/dom/events/KeyNameList.h
+++ b/dom/events/KeyNameList.h
@@ -206,20 +206,20 @@ DEFINE_KEYNAME_WITH_SAME_NAME(F35)
 /******************************************************************************
  * Multimedia Keys
  *****************************************************************************/
 // 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(MediaPlayPause)
-DEFINE_KEYNAME_WITH_SAME_NAME(SelectMedia) // Rename to MediaSelect
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaSelect)
 DEFINE_KEYNAME_WITH_SAME_NAME(MediaStop)
-DEFINE_KEYNAME_WITH_SAME_NAME(MediaNextTrack) // Rename to MediaTrackNext
-DEFINE_KEYNAME_WITH_SAME_NAME(MediaPreviousTrack) // Rename to MediaTrackPrevious
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaTrackNext)
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaTrackPrevious)
 // DEFINE_KEYNAME_WITH_SAME_NAME(New)
 // DEFINE_KEYNAME_WITH_SAME_NAME(Open)
 // DEFINE_KEYNAME_WITH_SAME_NAME(Print)
 // DEFINE_KEYNAME_WITH_SAME_NAME(Save)
 // DEFINE_KEYNAME_WITH_SAME_NAME(SpellCheck)
 DEFINE_KEYNAME_WITH_SAME_NAME(VolumeDown)
 DEFINE_KEYNAME_WITH_SAME_NAME(VolumeUp)
 DEFINE_KEYNAME_WITH_SAME_NAME(VolumeMute)
--- a/widget/NativeKeyToDOMKeyName.h
+++ b/widget/NativeKeyToDOMKeyName.h
@@ -729,36 +729,36 @@ KEY_MAP_QT      (F35, Qt::Key_F35)
 /******************************************************************************
  * Multimedia Keys
  ******************************************************************************/
 // MediaPlayPause
 KEY_MAP_WIN     (MediaPlayPause, VK_MEDIA_PLAY_PAUSE)
 KEY_MAP_QT      (MediaPlayPause, Qt::Key_MediaTogglePlayPause)
 KEY_MAP_ANDROID (MediaPlayPause, AKEYCODE_MEDIA_PLAY_PAUSE)
 
-// SelectMedia
-KEY_MAP_WIN     (SelectMedia, VK_LAUNCH_MEDIA_SELECT)
+// MediaSelect
+KEY_MAP_WIN     (MediaSelect, VK_LAUNCH_MEDIA_SELECT)
 
 // MediaStop
 KEY_MAP_WIN     (MediaStop, VK_MEDIA_STOP)
 KEY_MAP_GTK     (MediaStop, GDK_AudioStop)
 KEY_MAP_QT      (MediaStop, Qt::Key_MediaStop)
 KEY_MAP_ANDROID (MediaStop, AKEYCODE_MEDIA_STOP)
 
-// MediaNextTrack
-KEY_MAP_WIN     (MediaNextTrack, VK_MEDIA_NEXT_TRACK)
-KEY_MAP_GTK     (MediaNextTrack, GDK_AudioNext)
-KEY_MAP_QT      (MediaNextTrack, Qt::Key_MediaNext)
-KEY_MAP_ANDROID (MediaNextTrack, AKEYCODE_MEDIA_NEXT)
+// MediaTrackNext
+KEY_MAP_WIN     (MediaTrackNext, VK_MEDIA_NEXT_TRACK)
+KEY_MAP_GTK     (MediaTrackNext, GDK_AudioNext)
+KEY_MAP_QT      (MediaTrackNext, Qt::Key_MediaNext)
+KEY_MAP_ANDROID (MediaTrackNext, AKEYCODE_MEDIA_NEXT)
 
-// MediaPreviousTrack
-KEY_MAP_WIN     (MediaPreviousTrack, VK_MEDIA_PREV_TRACK)
-KEY_MAP_GTK     (MediaPreviousTrack, GDK_AudioPrev)
-KEY_MAP_QT      (MediaPreviousTrack, Qt::Key_MediaPrevious)
-KEY_MAP_ANDROID (MediaPreviousTrack, AKEYCODE_MEDIA_PREVIOUS)
+// MediaTrackPrevious
+KEY_MAP_WIN     (MediaTrackPrevious, VK_MEDIA_PREV_TRACK)
+KEY_MAP_GTK     (MediaTrackPrevious, GDK_AudioPrev)
+KEY_MAP_QT      (MediaTrackPrevious, Qt::Key_MediaPrevious)
+KEY_MAP_ANDROID (MediaTrackPrevious, AKEYCODE_MEDIA_PREVIOUS)
 
 // VolumeDown
 KEY_MAP_WIN     (VolumeDown, VK_VOLUME_DOWN)
 KEY_MAP_COCOA   (VolumeDown, kVK_VolumeDown)
 KEY_MAP_GTK     (VolumeDown, GDK_AudioLowerVolume)
 KEY_MAP_QT      (VolumeDown, Qt::Key_VolumeDown)
 KEY_MAP_ANDROID (VolumeDown, AKEYCODE_VOLUME_DOWN)