<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185678] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185678">185678</a></dd>
<dt>Author</dt> <dd>mrajca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-17 17:01:10 -0700 (Wed, 17 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionMediaRemoteControlsidl">trunk/Source/WebCore/Modules/mediasession/MediaRemoteControls.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionMediaSessioncpp">trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionMediaSessionh">trunk/Source/WebCore/Modules/mediasession/MediaSession.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionMediaSessionManagercpp">trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionMediaSessionManagerh">trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.h</a></li>
<li><a href="#trunkSourceWebCoredomEventNamesh">trunk/Source/WebCore/dom/EventNames.h</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185677 => 185678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-17 23:38:39 UTC (rev 185677)
+++ trunk/Source/WebCore/ChangeLog 2015-06-18 00:01:10 UTC (rev 185678)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+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):
+
</ins><span class="cx"> 2015-06-17 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: VoiceOver in iOS not announcing generic WAI-ARIA region, even if labelled properly
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaRemoteControlsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaRemoteControls.idl (185677 => 185678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaRemoteControls.idl 2015-06-17 23:38:39 UTC (rev 185677)
+++ trunk/Source/WebCore/Modules/mediasession/MediaRemoteControls.idl 2015-06-18 00:01:10 UTC (rev 185678)
</span><span class="lines">@@ -34,4 +34,7 @@
</span><span class="cx"> attribute boolean nextTrackEnabled;
</span><span class="cx"> attribute boolean seekForwardEnabled;
</span><span class="cx"> attribute boolean seekBackwardEnabled;
</span><ins>+
+ attribute EventHandler onprevioustrack;
+ attribute EventHandler onnexttrack;
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp (185677 => 185678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp 2015-06-17 23:38:39 UTC (rev 185677)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp 2015-06-18 00:01:10 UTC (rev 185678)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx">
</span><ins>+#include "Event.h"
</ins><span class="cx"> #include "HTMLMediaElement.h"
</span><span class="cx"> #include "MediaSessionManager.h"
</span><span class="cx">
</span><span class="lines">@@ -111,6 +112,18 @@
</span><span class="cx"> m_iteratedActiveParticipatingElements = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaSession::skipToNextTrack()
+{
+ if (m_controls && m_controls->nextTrackEnabled())
+ m_controls->dispatchEvent(Event::create(eventNames().nexttrackEvent, false, false));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaSession::skipToPreviousTrack()
+{
+ if (m_controls && m_controls->previousTrackEnabled())
+ m_controls->dispatchEvent(Event::create(eventNames().previoustrackEvent, false, false));
+}
+
+}
+
</ins><span class="cx"> #endif /* ENABLE(MEDIA_SESSION) */
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.h (185677 => 185678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaSession.h 2015-06-17 23:38:39 UTC (rev 185677)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.h 2015-06-18 00:01:10 UTC (rev 185678)
</span><span class="lines">@@ -61,6 +61,8 @@
</span><span class="cx"> bool invoke();
</span><span class="cx">
</span><span class="cx"> void togglePlayback();
</span><ins>+ void skipToNextTrack();
+ void skipToPreviousTrack();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class HTMLMediaElement;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.cpp (185677 => 185678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.cpp 2015-06-17 23:38:39 UTC (rev 185677)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.cpp 2015-06-18 00:01:10 UTC (rev 185678)
</span><span class="lines">@@ -33,6 +33,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static const char* contentSessionKind = "content";
+
</ins><span class="cx"> MediaSessionManager& MediaSessionManager::singleton()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<MediaSessionManager> manager;
</span><span class="lines">@@ -53,11 +55,33 @@
</span><span class="cx"> {
</span><span class="cx"> for (auto* session : m_sessions) {
</span><span class="cx"> String sessionKind = session->kind();
</span><del>- if (session->currentState() == MediaSession::State::Active && (sessionKind == "content" || sessionKind == ""))
</del><ins>+ if (session->currentState() == MediaSession::State::Active && (sessionKind == contentSessionKind || sessionKind == ""))
</ins><span class="cx"> session->togglePlayback();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+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();
+ }
+}
+
+}
+
</ins><span class="cx"> #endif /* ENABLE(MEDIA_SESSION) */
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaSessionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.h (185677 => 185678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.h 2015-06-17 23:38:39 UTC (rev 185677)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.h 2015-06-18 00:01:10 UTC (rev 185678)
</span><span class="lines">@@ -39,7 +39,9 @@
</span><span class="cx"> static MediaSessionManager& singleton();
</span><span class="cx">
</span><span class="cx"> void togglePlayback();
</span><del>-
</del><ins>+ void skipToNextTrack();
+ void skipToPreviousTrack();
+
</ins><span class="cx"> private:
</span><span class="cx"> friend class MediaSession;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventNamesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventNames.h (185677 => 185678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventNames.h 2015-06-17 23:38:39 UTC (rev 185677)
+++ trunk/Source/WebCore/dom/EventNames.h 2015-06-18 00:01:10 UTC (rev 185678)
</span><span class="lines">@@ -142,6 +142,7 @@
</span><span class="cx"> macro(mousewheel) \
</span><span class="cx"> macro(mute) \
</span><span class="cx"> macro(negotiationneeded) \
</span><ins>+ macro(nexttrack) \
</ins><span class="cx"> macro(nomatch) \
</span><span class="cx"> macro(noupdate) \
</span><span class="cx"> macro(obsolete) \
</span><span class="lines">@@ -160,6 +161,7 @@
</span><span class="cx"> macro(pointerlockchange) \
</span><span class="cx"> macro(pointerlockerror) \
</span><span class="cx"> macro(popstate) \
</span><ins>+ macro(previoustrack) \
</ins><span class="cx"> macro(progress) \
</span><span class="cx"> macro(ratechange) \
</span><span class="cx"> macro(readystatechange) \
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (185677 => 185678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2015-06-17 23:38:39 UTC (rev 185677)
+++ trunk/Source/WebCore/page/Page.cpp 2015-06-18 00:01:10 UTC (rev 185678)
</span><span class="lines">@@ -1238,8 +1238,12 @@
</span><span class="cx"> case MediaEventType::PlayPause:
</span><span class="cx"> MediaSessionManager::singleton().togglePlayback();
</span><span class="cx"> break;
</span><del>- default:
</del><ins>+ case MediaEventType::TrackNext:
+ MediaSessionManager::singleton().skipToNextTrack();
</ins><span class="cx"> break;
</span><ins>+ case MediaEventType::TrackPrevious:
+ MediaSessionManager::singleton().skipToPreviousTrack();
+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>