<!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>[186123] 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/186123">186123</a></dd>
<dt>Author</dt> <dd>mrajca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-30 11:10:55 -0700 (Tue, 30 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Session: implement algorithm for updating a media element's session (6.1)
https://bugs.webkit.org/show_bug.cgi?id=146460
Reviewed by Darin Adler.
In addition to storing a pointer to the new media session, we now:
- pause the media element if it is 'active' in the current media session
- remove the media element from the current media session
- release the current media session if there are no more active media elements
- set the default media session if the new media session is null
- update the 'kind' attribute to match the kind of the new media session
* Modules/mediasession/MediaSession.cpp:
(WebCore::MediaSession::isMediaElementActive):
(WebCore::MediaSession::hasActiveMediaElements):
* Modules/mediasession/MediaSession.h:
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::setSession):
(WebCore::HTMLMediaElement::setSessionInternal):
* html/HTMLMediaElement.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>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186122 => 186123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-30 18:08:19 UTC (rev 186122)
+++ trunk/Source/WebCore/ChangeLog 2015-06-30 18:10:55 UTC (rev 186123)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-06-30 Matt Rajca <mrajca@apple.com>
+
+ Media Session: implement algorithm for updating a media element's session (6.1)
+ https://bugs.webkit.org/show_bug.cgi?id=146460
+
+ Reviewed by Darin Adler.
+
+ In addition to storing a pointer to the new media session, we now:
+
+ - pause the media element if it is 'active' in the current media session
+ - remove the media element from the current media session
+ - release the current media session if there are no more active media elements
+ - set the default media session if the new media session is null
+ - update the 'kind' attribute to match the kind of the new media session
+
+ * Modules/mediasession/MediaSession.cpp:
+ (WebCore::MediaSession::isMediaElementActive):
+ (WebCore::MediaSession::hasActiveMediaElements):
+ * Modules/mediasession/MediaSession.h:
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::setSession):
+ (WebCore::HTMLMediaElement::setSessionInternal):
+ * html/HTMLMediaElement.h:
+
</ins><span class="cx"> 2015-06-29 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of unused WKSI functions
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp (186122 => 186123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp 2015-06-30 18:08:19 UTC (rev 186122)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp 2015-06-30 18:10:55 UTC (rev 186123)
</span><span class="lines">@@ -125,6 +125,16 @@
</span><span class="cx"> m_activeParticipatingElements.add(&element);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool MediaSession::isMediaElementActive(HTMLMediaElement& element)
+{
+ return m_activeParticipatingElements.contains(&element);
+}
+
+bool MediaSession::hasActiveMediaElements()
+{
+ return !m_activeParticipatingElements.isEmpty();
+}
+
</ins><span class="cx"> void MediaSession::setMetadata(const Dictionary& metadata)
</span><span class="cx"> {
</span><span class="cx"> // 5.1.3
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.h (186122 => 186123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaSession.h 2015-06-30 18:08:19 UTC (rev 186122)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.h 2015-06-30 18:10:55 UTC (rev 186123)
</span><span class="lines">@@ -88,6 +88,8 @@
</span><span class="cx"> void removeMediaElement(HTMLMediaElement&);
</span><span class="cx">
</span><span class="cx"> void addActiveMediaElement(HTMLMediaElement&);
</span><ins>+ bool isMediaElementActive(HTMLMediaElement&);
+ bool hasActiveMediaElements();
</ins><span class="cx">
</span><span class="cx"> void releaseInternal();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (186122 => 186123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-06-30 18:08:19 UTC (rev 186122)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-06-30 18:10:55 UTC (rev 186123)
</span><span class="lines">@@ -6452,15 +6452,46 @@
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::setSession(MediaSession* session)
</span><span class="cx"> {
</span><del>- if (m_session)
</del><ins>+ // 6.1
+ // 1. Let m be the media element in question.
+ // 2. Let old media session be m's current media session, if it has one, and null otherwise.
+ // 3. Let new media session be null.
+ // 4. Set m's current media session to null, if it currently has one.
+ // 5. Let m's current media session be the new value or the top-level browsing context's media session if the new
+ // value is null.
+ // 6. If the new value is null, then set the m's kind IDL attribute to the empty string. Otherwise, set m's kind IDL
+ // attribute to the value of current media session's kind attribute.
+ // 7. Let new media session be m's current media session.
+ // 8. Update media sessions: If old media session and new media session are the same (whether both null or both the
+ // same media session), then terminate these steps.
+ // 9. If m is an active audio-producing participant of old media session, then pause m and remove m from old media
+ // session's active audio-producing participants.
+ // 10. If old media session is not null and no longer has one or more active audio-producing participants, then run
+ // the media session release algorithm for old media session.
+
+ if (m_session) {
+ if (m_session->isMediaElementActive(*this))
+ pause();
+
</ins><span class="cx"> m_session->removeMediaElement(*this);
</span><span class="cx">
</span><del>- m_session = session;
</del><ins>+ if (!m_session->hasActiveMediaElements())
+ m_session->releaseSession();
+ }
</ins><span class="cx">
</span><span class="cx"> if (session)
</span><del>- session->addMediaElement(*this);
</del><ins>+ setSessionInternal(*session);
+ else
+ setSessionInternal(document().defaultMediaSession());
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void HTMLMediaElement::setSessionInternal(MediaSession& session)
+{
+ m_session = &session;
+ session.addMediaElement(*this);
+ m_kind = session.kind();
+}
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (186122 => 186123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2015-06-30 18:08:19 UTC (rev 186122)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2015-06-30 18:10:55 UTC (rev 186123)
</span><span class="lines">@@ -556,6 +556,10 @@
</span><span class="cx"> virtual bool dispatchEvent(PassRefPtr<Event>) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_SESSION)
+ void setSessionInternal(MediaSession&);
+#endif
+
</ins><span class="cx"> virtual String mediaPlayerReferrer() const override;
</span><span class="cx"> virtual String mediaPlayerUserAgent() const override;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>