Changeset 185678 in webkit

Timestamp:

Jun 17, 2015 5:01:10 PM (9 years ago)

Author:

mrajca@apple.com

Message:

MediaSession: handle MediaEventTrackNext and MediaEventTrackPrevious events
​https://bugs.webkit.org/show_bug.cgi?id=146028

Reviewed by Darin Adler.

• Modules/mediasession/MediaRemoteControls.idl: Added nexttrack/previoustrack event handlers.
• Modules/mediasession/MediaSession.cpp: Dispatch the nexttrack/previoustrack events.

(WebCore::MediaSession::skipToNextTrack):
(WebCore::MediaSession::skipToPreviousTrack):

• Modules/mediasession/MediaSession.h:
• Modules/mediasession/MediaSessionManager.cpp: Skip to the next/previous track as described in the media session spec.

(WebCore::MediaSessionManager::skipToNextTrack):
(WebCore::MediaSessionManager::skipToPreviousTrack):

• Modules/mediasession/MediaSessionManager.h:
• dom/EventNames.h: Added the nexttrack/previoustrack event names.
• page/Page.cpp: Tell MediaSessionManager to handle the new track-skipping events.

(WebCore::Page::handleMediaEvent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediasession/MediaRemoteControls.idl (modified) (1 diff)
• Modules/mediasession/MediaSession.cpp (modified) (2 diffs)
• Modules/mediasession/MediaSession.h (modified) (1 diff)
• Modules/mediasession/MediaSessionManager.cpp (modified) (2 diffs)
• Modules/mediasession/MediaSessionManager.h (modified) (1 diff)
• dom/EventNames.h (modified) (2 diffs)
• page/Page.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-16  Matt Rajca  <mrajca@apple.com>
+
+        MediaSession: handle MediaEventTrackNext and MediaEventTrackPrevious events
+        https://bugs.webkit.org/show_bug.cgi?id=146028
+
+        Reviewed by Darin Adler.
+
+        * Modules/mediasession/MediaRemoteControls.idl: Added nexttrack/previoustrack event handlers.
+        * Modules/mediasession/MediaSession.cpp: Dispatch the nexttrack/previoustrack events.
+        (WebCore::MediaSession::skipToNextTrack):
+        (WebCore::MediaSession::skipToPreviousTrack):
+        * Modules/mediasession/MediaSession.h:
+        * Modules/mediasession/MediaSessionManager.cpp: Skip to the next/previous track as described in the media session spec.
+        (WebCore::MediaSessionManager::skipToNextTrack):
+        (WebCore::MediaSessionManager::skipToPreviousTrack):
+        * Modules/mediasession/MediaSessionManager.h:
+        * dom/EventNames.h: Added the nexttrack/previoustrack event names.
+        * page/Page.cpp: Tell MediaSessionManager to handle the new track-skipping events.
+        (WebCore::Page::handleMediaEvent):
+
 2015-06-17  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/Modules/mediasession/MediaRemoteControls.idl

@@ -35 +35 @@
     attribute boolean seekForwardEnabled;
     attribute boolean seekBackwardEnabled;
+
+    attribute EventHandler onprevioustrack;
+    attribute EventHandler onnexttrack;
 };

trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp

@@ -29 +29 @@
 #if ENABLE(MEDIA_SESSION)
 
+#include "Event.h"
 #include "HTMLMediaElement.h"
 #include "MediaSessionManager.h"
@@ -112 +113 @@
 }
 
+void MediaSession::skipToNextTrack()
+{
+    if (m_controls && m_controls->nextTrackEnabled())
+        m_controls->dispatchEvent(Event::create(eventNames().nexttrackEvent, false, false));
+}
+
+void MediaSession::skipToPreviousTrack()
+{
+    if (m_controls && m_controls->previousTrackEnabled())
+        m_controls->dispatchEvent(Event::create(eventNames().previoustrackEvent, false, false));
+}
+
 }
 

trunk/Source/WebCore/Modules/mediasession/MediaSession.h

@@ -62 +62 @@
 
     void togglePlayback();
+    void skipToNextTrack();
+    void skipToPreviousTrack();
 
 private:

trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.cpp

@@ -34 +34 @@
 namespace WebCore {
 
+static const char* contentSessionKind = "content";
+
 MediaSessionManager& MediaSessionManager::singleton()
 {
@@ -54 +56 @@
     for (auto* session : m_sessions) {
         String sessionKind = session->kind();
-        if (session->currentState() == MediaSession::State::Active && (sessionKind == "content" || sessionKind == ""))
+        if (session->currentState() == MediaSession::State::Active && (sessionKind == contentSessionKind || sessionKind == ""))
             session->togglePlayback();
+    }
+}
+
+void MediaSessionManager::skipToNextTrack()
+{
+    // 5.2.2 When the user presses the MediaTrackNext media key, then for each Content-based media session that is
+    // currently ACTIVE and has a media remote controller with its nextTrackEnabled attribute set to true, queue a task
+    // to fire a simple event named nexttrack at its media remote controller.
+    for (auto* session : m_sessions) {
+        if (session->currentState() == MediaSession::State::Active && session->kind() == contentSessionKind)
+            session->skipToNextTrack();
+    }
+}
+
+void MediaSessionManager::skipToPreviousTrack()
+{
+    // 5.2.2 When the user presses the MediaTrackPrevious media key, then for each Content-based media session that is
+    // currently ACTIVE and has a media remote controller with its previousTrackEnabled attribute set to true, queue a task
+    // to fire a simple event named previoustrack at its media remote controller.
+    for (auto* session : m_sessions) {
+        if (session->currentState() == MediaSession::State::Active && session->kind() == contentSessionKind)
+            session->skipToPreviousTrack();
     }
 }

trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.h

@@ -40 +40 @@
 
     void togglePlayback();
-    
+    void skipToNextTrack();
+    void skipToPreviousTrack();
+
 private:
     friend class MediaSession;

trunk/Source/WebCore/dom/EventNames.h

@@ -143 +143 @@
     macro(mute) \
     macro(negotiationneeded) \
+    macro(nexttrack) \
     macro(nomatch) \
     macro(noupdate) \
@@ -161 +162 @@
     macro(pointerlockerror) \
     macro(popstate) \
+    macro(previoustrack) \
     macro(progress) \
     macro(ratechange) \

trunk/Source/WebCore/page/Page.cpp

@@ -1239 +1239 @@
         MediaSessionManager::singleton().togglePlayback();
         break;
-    default:
+    case MediaEventType::TrackNext:
+        MediaSessionManager::singleton().skipToNextTrack();
+        break;
+    case MediaEventType::TrackPrevious:
+        MediaSessionManager::singleton().skipToPreviousTrack();
         break;
     }