<!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>[186593] 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/186593">186593</a></dd>
<dt>Author</dt> <dd>mrajca@apple.com</dd>
<dt>Date</dt> <dd>2015-07-09 09:26:33 -0700 (Thu, 09 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Session: report to chrome client 'hasActiveMediaElements' changes
https://bugs.webkit.org/show_bug.cgi?id=146745
Reviewed by Eric Carlson.
* Modules/mediasession/MediaSession.cpp: All updates to active media elements are now funneled through a helper
method that will invoke the 'hasMediaSessionWithActiveMediaElementsDidChange' callback when necessary.
(WebCore::MediaSession::removeMediaElement):
(WebCore::MediaSession::changeActiveMediaElements):
(WebCore::MediaSession::addActiveMediaElement):
(WebCore::MediaSession::releaseSession):
* Modules/mediasession/MediaSession.h:
* Modules/mediasession/MediaSessionManager.cpp:
(WebCore::MediaSessionManager::hasActiveMediaElements):
* Modules/mediasession/MediaSessionManager.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="#trunkSourceWebCoreModulesmediasessionMediaSessionManagercpp">trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionMediaSessionManagerh">trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186592 => 186593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-09 15:27:43 UTC (rev 186592)
+++ trunk/Source/WebCore/ChangeLog 2015-07-09 16:26:33 UTC (rev 186593)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-07-08 Matt Rajca <mrajca@apple.com>
+
+ Media Session: report to chrome client 'hasActiveMediaElements' changes
+ https://bugs.webkit.org/show_bug.cgi?id=146745
+
+ Reviewed by Eric Carlson.
+
+ * Modules/mediasession/MediaSession.cpp: All updates to active media elements are now funneled through a helper
+ method that will invoke the 'hasMediaSessionWithActiveMediaElementsDidChange' callback when necessary.
+ (WebCore::MediaSession::removeMediaElement):
+ (WebCore::MediaSession::changeActiveMediaElements):
+ (WebCore::MediaSession::addActiveMediaElement):
+ (WebCore::MediaSession::releaseSession):
+ * Modules/mediasession/MediaSession.h:
+ * Modules/mediasession/MediaSessionManager.cpp:
+ (WebCore::MediaSessionManager::hasActiveMediaElements):
+ * Modules/mediasession/MediaSessionManager.h:
+
</ins><span class="cx"> 2015-07-09 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r182866): repeated prompts for password on internal Apple website using workers
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp (186592 => 186593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp 2015-07-09 15:27:43 UTC (rev 186592)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp 2015-07-09 16:26:33 UTC (rev 186593)
</span><span class="lines">@@ -115,14 +115,33 @@
</span><span class="cx"> ASSERT(m_participatingElements.contains(&element));
</span><span class="cx"> m_participatingElements.remove(&element);
</span><span class="cx">
</span><del>- m_activeParticipatingElements.remove(&element);
</del><ins>+ changeActiveMediaElements([&]() {
+ m_activeParticipatingElements.remove(&element);
+ });
+
</ins><span class="cx"> if (m_iteratedActiveParticipatingElements)
</span><span class="cx"> m_iteratedActiveParticipatingElements->remove(&element);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaSession::changeActiveMediaElements(std::function<void(void)> worker)
+{
+ if (Page *page = m_document.page()) {
+ bool hadActiveMediaElements = MediaSessionManager::singleton().hasActiveMediaElements();
+
+ worker();
+
+ bool hasActiveMediaElements = MediaSessionManager::singleton().hasActiveMediaElements();
+ if (hadActiveMediaElements != hasActiveMediaElements)
+ page->chrome().client().hasMediaSessionWithActiveMediaElementsDidChange(hasActiveMediaElements);
+ } else
+ worker();
+}
+
</ins><span class="cx"> void MediaSession::addActiveMediaElement(HTMLMediaElement& element)
</span><span class="cx"> {
</span><del>- m_activeParticipatingElements.add(&element);
</del><ins>+ changeActiveMediaElements([&]() {
+ m_activeParticipatingElements.add(&element);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MediaSession::isMediaElementActive(HTMLMediaElement& element)
</span><span class="lines">@@ -130,7 +149,7 @@
</span><span class="cx"> return m_activeParticipatingElements.contains(&element);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaSession::hasActiveMediaElements()
</del><ins>+bool MediaSession::hasActiveMediaElements() const
</ins><span class="cx"> {
</span><span class="cx"> return !m_activeParticipatingElements.isEmpty();
</span><span class="cx"> }
</span><span class="lines">@@ -171,8 +190,10 @@
</span><span class="cx"> // 1. Let media session be the current media session.
</span><span class="cx"> // 2. Indefinitely pause all of media session's active participating media elements.
</span><span class="cx"> // 3. Reset media session's active participating media elements to an empty list.
</span><del>- while (!m_activeParticipatingElements.isEmpty())
- m_activeParticipatingElements.takeAny()->pause();
</del><ins>+ changeActiveMediaElements([&]() {
+ while (!m_activeParticipatingElements.isEmpty())
+ m_activeParticipatingElements.takeAny()->pause();
+ });
</ins><span class="cx">
</span><span class="cx"> // 4. Run the media session release algorithm for media session.
</span><span class="cx"> releaseInternal();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.h (186592 => 186593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaSession.h 2015-07-09 15:27:43 UTC (rev 186592)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.h 2015-07-09 16:26:33 UTC (rev 186593)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> MediaRemoteControls* controls(bool& isNull);
</span><span class="cx">
</span><span class="cx"> State currentState() const { return m_currentState; }
</span><ins>+ bool hasActiveMediaElements() const;
</ins><span class="cx">
</span><span class="cx"> void setMetadata(const Dictionary&);
</span><span class="cx">
</span><span class="lines">@@ -87,9 +88,9 @@
</span><span class="cx"> void addMediaElement(HTMLMediaElement&);
</span><span class="cx"> void removeMediaElement(HTMLMediaElement&);
</span><span class="cx">
</span><ins>+ void changeActiveMediaElements(std::function<void(void)>);
</ins><span class="cx"> void addActiveMediaElement(HTMLMediaElement&);
</span><span class="cx"> bool isMediaElementActive(HTMLMediaElement&);
</span><del>- bool hasActiveMediaElements();
</del><span class="cx">
</span><span class="cx"> void releaseInternal();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.cpp (186592 => 186593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.cpp 2015-07-09 15:27:43 UTC (rev 186592)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.cpp 2015-07-09 16:26:33 UTC (rev 186593)
</span><span class="lines">@@ -41,6 +41,16 @@
</span><span class="cx"> return manager;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool MediaSessionManager::hasActiveMediaElements() const
+{
+ for (auto* session : m_sessions) {
+ if (session->hasActiveMediaElements())
+ return true;
+ }
+
+ return false;
+}
+
</ins><span class="cx"> void MediaSessionManager::addMediaSession(MediaSession& session)
</span><span class="cx"> {
</span><span class="cx"> m_sessions.add(&session);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaSessionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.h (186592 => 186593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.h 2015-07-09 15:27:43 UTC (rev 186592)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.h 2015-07-09 16:26:33 UTC (rev 186593)
</span><span class="lines">@@ -45,6 +45,8 @@
</span><span class="cx"> private:
</span><span class="cx"> friend class MediaSession;
</span><span class="cx">
</span><ins>+ bool hasActiveMediaElements() const;
+
</ins><span class="cx"> void addMediaSession(MediaSession&);
</span><span class="cx"> void removeMediaSession(MediaSession&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>