<!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>[189107] trunk</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/189107">189107</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-08-28 11:21:21 -0700 (Fri, 28 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Session: MediaSession.releaseSession() renamed to deactivate()
https://bugs.webkit.org/show_bug.cgi?id=148578
Reviewed by Jer Noble.
Source/WebCore:
No new tests, media/session/releasing-sessions.html was updated for the change.
* Modules/mediasession/MediaSession.cpp:
(WebCore::MediaSession::deactivate): Renamed from releaseSession.
(WebCore::MediaSession::releaseSession): Deleted.
* Modules/mediasession/MediaSession.h:
* Modules/mediasession/MediaSession.idl:
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::setSession): releaseSession -> deactivate.
LayoutTests:
* media/session/releasing-sessions-expected.txt:
* media/session/releasing-sessions.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediasessionreleasingsessionsexpectedtxt">trunk/LayoutTests/media/session/releasing-sessions-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediasessionreleasingsessionshtml">trunk/LayoutTests/media/session/releasing-sessions.html</a></li>
<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="#trunkSourceWebCoreModulesmediasessionMediaSessionidl">trunk/Source/WebCore/Modules/mediasession/MediaSession.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (189106 => 189107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-08-28 18:13:37 UTC (rev 189106)
+++ trunk/LayoutTests/ChangeLog 2015-08-28 18:21:21 UTC (rev 189107)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-28 Eric Carlson <eric.carlson@apple.com>
+
+ Media Session: MediaSession.releaseSession() renamed to deactivate()
+ https://bugs.webkit.org/show_bug.cgi?id=148578
+
+ Reviewed by Jer Noble.
+
+ * media/session/releasing-sessions-expected.txt:
+ * media/session/releasing-sessions.html:
+
</ins><span class="cx"> 2015-08-28 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Separate creating a style sheet from adding a new rule in the protocol
</span></span></pre></div>
<a id="trunkLayoutTestsmediasessionreleasingsessionsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/session/releasing-sessions-expected.txt (189106 => 189107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/session/releasing-sessions-expected.txt 2015-08-28 18:13:37 UTC (rev 189106)
+++ trunk/LayoutTests/media/session/releasing-sessions-expected.txt 2015-08-28 18:21:21 UTC (rev 189107)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> Media began playing.
</span><span class="cx"> EXPECTED (video.paused == 'false') OK
</span><span class="cx"> EXPECTED (internals.mediaSessionCurrentState(session) == 'active') OK
</span><del>-RUN(session.releaseSession())
</del><ins>+RUN(session.deactivate())
</ins><span class="cx"> EXPECTED (video.paused == 'true') OK
</span><span class="cx"> EXPECTED (internals.mediaSessionCurrentState(session) == 'idle') OK
</span><span class="cx"> END OF TEST
</span></span></pre></div>
<a id="trunkLayoutTestsmediasessionreleasingsessionshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/session/releasing-sessions.html (189106 => 189107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/session/releasing-sessions.html 2015-08-28 18:13:37 UTC (rev 189106)
+++ trunk/LayoutTests/media/session/releasing-sessions.html 2015-08-28 18:21:21 UTC (rev 189107)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> if (window.internals)
</span><span class="cx"> testExpected('internals.mediaSessionCurrentState(session)', "active");
</span><span class="cx">
</span><del>- run('session.releaseSession()');
</del><ins>+ run('session.deactivate()');
</ins><span class="cx">
</span><span class="cx"> testExpected('video.paused', true);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189106 => 189107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-28 18:13:37 UTC (rev 189106)
+++ trunk/Source/WebCore/ChangeLog 2015-08-28 18:21:21 UTC (rev 189107)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-08-28 Eric Carlson <eric.carlson@apple.com>
+
+ Media Session: MediaSession.releaseSession() renamed to deactivate()
+ https://bugs.webkit.org/show_bug.cgi?id=148578
+
+ Reviewed by Jer Noble.
+
+ No new tests, media/session/releasing-sessions.html was updated for the change.
+
+ * Modules/mediasession/MediaSession.cpp:
+ (WebCore::MediaSession::deactivate): Renamed from releaseSession.
+ (WebCore::MediaSession::releaseSession): Deleted.
+ * Modules/mediasession/MediaSession.h:
+ * Modules/mediasession/MediaSession.idl:
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::setSession): releaseSession -> deactivate.
+
</ins><span class="cx"> 2015-08-28 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Separate creating a style sheet from adding a new rule in the protocol
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp (189106 => 189107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp 2015-08-28 18:13:37 UTC (rev 189106)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp 2015-08-28 18:21:21 UTC (rev 189107)
</span><span class="lines">@@ -185,18 +185,20 @@
</span><span class="cx"> page->chrome().client().mediaSessionMetadataDidChange(m_metadata);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaSession::releaseSession()
</del><ins>+void MediaSession::deactivate()
</ins><span class="cx"> {
</span><del>- // 5.1.3
</del><ins>+ // 5.1.2. Object members
+ // When the deactivate() method is invoked, the user agent must run the following steps:
</ins><span class="cx"> // 1. Let media session be the current media session.
</span><del>- // 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.
</del><ins>+ // 2. Indefinitely pause all of media session’s audio-producing participants.
+ // 3. Set media session's resume list to an empty list.
+ // 4. Set media session's audio-producing participants to an empty list.
</ins><span class="cx"> changeActiveMediaElements([&]() {
</span><span class="cx"> while (!m_activeParticipatingElements.isEmpty())
</span><span class="cx"> m_activeParticipatingElements.takeAny()->pause();
</span><span class="cx"> });
</span><span class="cx">
</span><del>- // 4. Run the media session release algorithm for media session.
</del><ins>+ // 5. Run the media session deactivation algorithm for media session.
</ins><span class="cx"> releaseInternal();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.h (189106 => 189107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaSession.h 2015-08-28 18:13:37 UTC (rev 189106)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.h 2015-08-28 18:21:21 UTC (rev 189107)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> void setMetadata(const Dictionary&);
</span><span class="cx">
</span><del>- void releaseSession();
</del><ins>+ void deactivate();
</ins><span class="cx">
</span><span class="cx"> // Runs the media session invocation algorithm and returns true on success.
</span><span class="cx"> bool invoke();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaSessionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.idl (189106 => 189107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaSession.idl 2015-08-28 18:13:37 UTC (rev 189106)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.idl 2015-08-28 18:21:21 UTC (rev 189107)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> void setMetadata(Dictionary metadata);
</span><span class="cx">
</span><del>- void releaseSession();
</del><ins>+ void deactivate();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum MediaSessionKind {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (189106 => 189107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-08-28 18:13:37 UTC (rev 189106)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-08-28 18:21:21 UTC (rev 189107)
</span><span class="lines">@@ -6569,7 +6569,7 @@
</span><span class="cx">
</span><span class="cx"> // 7. If old media session is not null and no longer has one or more audio-producing participants, then run the media session deactivation algorithm for old media session.
</span><span class="cx"> if (!m_session->hasActiveMediaElements())
</span><del>- m_session->releaseSession();
</del><ins>+ m_session->deactivate();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (session)
</span></span></pre>
</div>
</div>
</body>
</html>