<!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>[185885] 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/185885">185885</a></dd>
<dt>Author</dt> <dd>mrajca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-23 15:02:34 -0700 (Tue, 23 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support releasing media sessions
https://bugs.webkit.org/show_bug.cgi?id=146132
Reviewed by Darin Adler.
* Modules/mediasession/MediaSession.cpp: Implemented as described in the Media Session spec.
(WebCore::MediaSession::releaseSession):
(WebCore::MediaSession::releaseInternal):
* Modules/mediasession/MediaSession.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185884 => 185885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-23 21:41:13 UTC (rev 185884)
+++ trunk/Source/WebCore/ChangeLog 2015-06-23 22:02:34 UTC (rev 185885)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-06-18 Matt Rajca <mrajca@apple.com>
+
+ Support releasing media sessions
+ https://bugs.webkit.org/show_bug.cgi?id=146132
+
+ Reviewed by Darin Adler.
+
+ * Modules/mediasession/MediaSession.cpp: Implemented as described in the Media Session spec.
+ (WebCore::MediaSession::releaseSession):
+ (WebCore::MediaSession::releaseInternal):
+ * Modules/mediasession/MediaSession.h:
+
</ins><span class="cx"> 2015-06-23 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: iOS: VoiceOver and ARIA: has popup property not announced
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp (185884 => 185885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp 2015-06-23 21:41:13 UTC (rev 185884)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp 2015-06-23 22:02:34 UTC (rev 185885)
</span><span class="lines">@@ -74,8 +74,39 @@
</span><span class="cx">
</span><span class="cx"> void MediaSession::releaseSession()
</span><span class="cx"> {
</span><ins>+ // 5.1.3
+ // 1. Let media session be the current media session.
+ // 2. Indefinitely pause all of media session's active participating media elements.
+ // 3. Reset media session's active participating media elements to an empty list.
+ while (!m_activeParticipatingElements.isEmpty())
+ m_activeParticipatingElements.takeAny()->pause();
+
+ // 4. Run the media session release algorithm for media session.
+ releaseInternal();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaSession::releaseInternal()
+{
+ // 6.5. Releasing a media session
+ // 1. If current media session's current state is idle, then terminate these steps.
+ if (m_currentState == State::Idle)
+ return;
+
+ // 2. If current media session still has one or more active participating media elements, then terminate these steps.
+ if (!m_activeParticipatingElements.isEmpty())
+ return;
+
+ // 3. Optionally, based on platform conventions, the user agent must release any currently held platform media focus
+ // for current media session.
+ // 4. Optionally, based on platform conventions, the user agent must remove any previously established ongoing media
+ // interface in the underlying platform’s notifications area and any ongoing media interface in the underlying
+ // platform's lock screen area for current media session, if any.
+ // 5. Optionally, based on platform conventions, the user agent must prevent any hardware and/or software media keys
+ // from controlling playback of current media session's active participating media elements.
+ // 6. Set current media session's current state to idle.
+ m_currentState = State::Idle;
+}
+
</ins><span class="cx"> bool MediaSession::invoke()
</span><span class="cx"> {
</span><span class="cx"> // 4.4 Activating a media session
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.h (185884 => 185885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaSession.h 2015-06-23 21:41:13 UTC (rev 185884)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.h 2015-06-23 22:02:34 UTC (rev 185885)
</span><span class="lines">@@ -72,6 +72,8 @@
</span><span class="cx">
</span><span class="cx"> void addActiveMediaElement(HTMLMediaElement&);
</span><span class="cx">
</span><ins>+ void releaseInternal();
+
</ins><span class="cx"> State m_currentState { State::Idle };
</span><span class="cx"> Vector<HTMLMediaElement*> m_participatingElements;
</span><span class="cx"> HashSet<HTMLMediaElement*> m_activeParticipatingElements;
</span></span></pre>
</div>
</div>
</body>
</html>