<!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>[207688] 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/207688">207688</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-10-21 11:37:47 -0700 (Fri, 21 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebCore::PlatformMediaSession::stopSession + 13
https://bugs.webkit.org/show_bug.cgi?id=163799
Reviewed by Eric Carlson.
Because m_sessions can be mutated by removeSession() while iterating over m_sessions, and because
PlatformMediaSessions are not refcounted, it is not enough to copy m_sessions into a copied Vector
before iterating. Instead, wrap iteration of m_sessions in a convenience function, which sets an
iteration counter which, when cleared, removes all null entries from m_session. In parallel, modify
removeSession() to check this iteration counter, and replace the session with a null value rather
than mutating the m_sessions vector itself.
* platform/audio/PlatformMediaSessionManager.cpp:
(WebCore::PlatformMediaSessionManager::has):
(WebCore::PlatformMediaSessionManager::activeAudioSessionRequired):
(WebCore::PlatformMediaSessionManager::canProduceAudio):
(WebCore::PlatformMediaSessionManager::removeSession):
(WebCore::PlatformMediaSessionManager::sessionWillBeginPlayback):
(WebCore::PlatformMediaSessionManager::sessionWillEndPlayback):
(WebCore::PlatformMediaSessionManager::currentSessionsMatching):
(WebCore::PlatformMediaSessionManager::applicationWillEnterBackground):
(WebCore::PlatformMediaSessionManager::applicationDidEnterForeground):
(WebCore::PlatformMediaSessionManager::systemWillSleep):
(WebCore::PlatformMediaSessionManager::systemDidWake):
(WebCore::PlatformMediaSessionManager::stopAllMediaPlaybackForDocument):
(WebCore::PlatformMediaSessionManager::stopAllMediaPlaybackForProcess):
(WebCore::PlatformMediaSessionManager::forEachSession):
(WebCore::PlatformMediaSessionManager::anyOfSessions):
* platform/audio/PlatformMediaSessionManager.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioPlatformMediaSessionManagercpp">trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioPlatformMediaSessionManagerh">trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207687 => 207688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-21 18:32:04 UTC (rev 207687)
+++ trunk/Source/WebCore/ChangeLog 2016-10-21 18:37:47 UTC (rev 207688)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-10-21 Jer Noble <jer.noble@apple.com>
+
+ WebCore::PlatformMediaSession::stopSession + 13
+ https://bugs.webkit.org/show_bug.cgi?id=163799
+
+ Reviewed by Eric Carlson.
+
+ Because m_sessions can be mutated by removeSession() while iterating over m_sessions, and because
+ PlatformMediaSessions are not refcounted, it is not enough to copy m_sessions into a copied Vector
+ before iterating. Instead, wrap iteration of m_sessions in a convenience function, which sets an
+ iteration counter which, when cleared, removes all null entries from m_session. In parallel, modify
+ removeSession() to check this iteration counter, and replace the session with a null value rather
+ than mutating the m_sessions vector itself.
+
+ * platform/audio/PlatformMediaSessionManager.cpp:
+ (WebCore::PlatformMediaSessionManager::has):
+ (WebCore::PlatformMediaSessionManager::activeAudioSessionRequired):
+ (WebCore::PlatformMediaSessionManager::canProduceAudio):
+ (WebCore::PlatformMediaSessionManager::removeSession):
+ (WebCore::PlatformMediaSessionManager::sessionWillBeginPlayback):
+ (WebCore::PlatformMediaSessionManager::sessionWillEndPlayback):
+ (WebCore::PlatformMediaSessionManager::currentSessionsMatching):
+ (WebCore::PlatformMediaSessionManager::applicationWillEnterBackground):
+ (WebCore::PlatformMediaSessionManager::applicationDidEnterForeground):
+ (WebCore::PlatformMediaSessionManager::systemWillSleep):
+ (WebCore::PlatformMediaSessionManager::systemDidWake):
+ (WebCore::PlatformMediaSessionManager::stopAllMediaPlaybackForDocument):
+ (WebCore::PlatformMediaSessionManager::stopAllMediaPlaybackForProcess):
+ (WebCore::PlatformMediaSessionManager::forEachSession):
+ (WebCore::PlatformMediaSessionManager::anyOfSessions):
+ * platform/audio/PlatformMediaSessionManager.h:
+
</ins><span class="cx"> 2016-10-21 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Move some more assorted classes from ExceptionCode to Exception
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioPlatformMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp (207687 => 207688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp 2016-10-21 18:32:04 UTC (rev 207687)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp 2016-10-21 18:37:47 UTC (rev 207688)
</span><span class="lines">@@ -77,32 +77,23 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(type >= PlatformMediaSession::None && type <= PlatformMediaSession::WebAudio);
</span><span class="cx">
</span><del>- for (auto* session : m_sessions) {
- if (session->mediaType() == type)
- return true;
- }
-
- return false;
</del><ins>+ return anyOfSessions([type] (PlatformMediaSession& session, size_t) {
+ return session.mediaType() == type;
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool PlatformMediaSessionManager::activeAudioSessionRequired() const
</span><span class="cx"> {
</span><del>- for (auto* session : m_sessions) {
- if (session->activeAudioSessionRequired())
- return true;
- }
-
- return false;
</del><ins>+ return anyOfSessions([] (PlatformMediaSession& session, size_t) {
+ return session.activeAudioSessionRequired();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool PlatformMediaSessionManager::canProduceAudio() const
</span><span class="cx"> {
</span><del>- for (auto* session : m_sessions) {
- if (session->canProduceAudio())
- return true;
- }
-
- return false;
</del><ins>+ return anyOfSessions([] (PlatformMediaSession& session, size_t) {
+ return session.canProduceAudio();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int PlatformMediaSessionManager::count(PlatformMediaSession::MediaType type) const
</span><span class="lines">@@ -163,10 +154,13 @@
</span><span class="cx"> size_t index = m_sessions.find(&session);
</span><span class="cx"> if (index == notFound)
</span><span class="cx"> return;
</span><del>-
- m_sessions.remove(index);
</del><span class="cx">
</span><del>- if (m_sessions.isEmpty()) {
</del><ins>+ if (m_iteratingOverSessions)
+ m_sessions.at(index) = nullptr;
+ else
+ m_sessions.remove(index);
+
+ if (m_sessions.isEmpty() || std::all_of(m_sessions.begin(), m_sessions.end(), std::logical_not<void>())) {
</ins><span class="cx"> m_remoteCommandListener = nullptr;
</span><span class="cx"> m_audioHardwareListener = nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -211,15 +205,14 @@
</span><span class="cx"> if (m_interrupted)
</span><span class="cx"> endInterruption(PlatformMediaSession::NoFlags);
</span><span class="cx">
</span><del>- Vector<PlatformMediaSession*> sessions = m_sessions;
- for (auto* oneSession : sessions) {
- if (oneSession == &session)
- continue;
- if (oneSession->mediaType() == sessionType
</del><ins>+ forEachSession([&] (PlatformMediaSession& oneSession, size_t) {
+ if (&oneSession == &session)
+ return;
+ if (oneSession.mediaType() == sessionType
</ins><span class="cx"> && restrictions & ConcurrentPlaybackNotPermitted
</span><del>- && oneSession->state() == PlatformMediaSession::Playing)
- oneSession->pauseSession();
- }
</del><ins>+ && oneSession.state() == PlatformMediaSession::Playing)
+ oneSession.pauseSession();
+ });
</ins><span class="cx">
</span><span class="cx"> updateSessionState();
</span><span class="cx"> return true;
</span><span class="lines">@@ -234,20 +227,17 @@
</span><span class="cx">
</span><span class="cx"> size_t pausingSessionIndex = notFound;
</span><span class="cx"> size_t lastPlayingSessionIndex = notFound;
</span><del>- for (size_t i = 0; i < m_sessions.size(); ++i) {
- PlatformMediaSession* oneSession = m_sessions[i];
-
- if (oneSession == &session) {
</del><ins>+ anyOfSessions([&] (PlatformMediaSession& oneSession, size_t i) {
+ if (&oneSession == &session) {
</ins><span class="cx"> pausingSessionIndex = i;
</span><del>- continue;
</del><ins>+ return false;
</ins><span class="cx"> }
</span><del>- if (oneSession->state() == PlatformMediaSession::Playing) {
</del><ins>+ if (oneSession.state() == PlatformMediaSession::Playing) {
</ins><span class="cx"> lastPlayingSessionIndex = i;
</span><del>- continue;
</del><ins>+ return false;
</ins><span class="cx"> }
</span><del>- if (oneSession->state() != PlatformMediaSession::Playing)
- break;
- }
</del><ins>+ return oneSession.state() != PlatformMediaSession::Playing;
+ });
</ins><span class="cx"> if (lastPlayingSessionIndex == notFound || pausingSessionIndex == notFound)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -291,10 +281,10 @@
</span><span class="cx"> Vector<PlatformMediaSession*> PlatformMediaSessionManager::currentSessionsMatching(std::function<bool(const PlatformMediaSession &)> filter)
</span><span class="cx"> {
</span><span class="cx"> Vector<PlatformMediaSession*> matchingSessions;
</span><del>- for (auto& session : m_sessions) {
- if (filter(*session))
- matchingSessions.append(session);
- }
</del><ins>+ forEachSession([&] (PlatformMediaSession& session, size_t) {
+ if (filter(session))
+ matchingSessions.append(&session);
+ });
</ins><span class="cx"> return matchingSessions;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -313,10 +303,10 @@
</span><span class="cx"> m_isApplicationInBackground = true;
</span><span class="cx">
</span><span class="cx"> Vector<PlatformMediaSession*> sessions = m_sessions;
</span><del>- for (auto* session : sessions) {
- if (m_restrictions[session->mediaType()] & BackgroundProcessPlaybackRestricted)
- session->beginInterruption(PlatformMediaSession::EnteringBackground);
- }
</del><ins>+ forEachSession([&] (PlatformMediaSession& session, size_t) {
+ if (m_restrictions[session.mediaType()] & BackgroundProcessPlaybackRestricted)
+ session.beginInterruption(PlatformMediaSession::EnteringBackground);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformMediaSessionManager::applicationDidEnterForeground() const
</span><span class="lines">@@ -329,10 +319,10 @@
</span><span class="cx"> m_isApplicationInBackground = false;
</span><span class="cx">
</span><span class="cx"> Vector<PlatformMediaSession*> sessions = m_sessions;
</span><del>- for (auto* session : sessions) {
- if (m_restrictions[session->mediaType()] & BackgroundProcessPlaybackRestricted)
- session->endInterruption(PlatformMediaSession::MayResumePlaying);
- }
</del><ins>+ forEachSession([&] (PlatformMediaSession& session, size_t) {
+ if (m_restrictions[session.mediaType()] & BackgroundProcessPlaybackRestricted)
+ session.endInterruption(PlatformMediaSession::MayResumePlaying);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformMediaSessionManager::sessionIsPlayingToWirelessPlaybackTargetChanged(PlatformMediaSession& session)
</span><span class="lines">@@ -376,8 +366,9 @@
</span><span class="cx"> if (m_interrupted)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- for (auto* session : m_sessions)
- session->beginInterruption(PlatformMediaSession::SystemSleep);
</del><ins>+ forEachSession([] (PlatformMediaSession& session, size_t) {
+ session.beginInterruption(PlatformMediaSession::SystemSleep);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformMediaSessionManager::systemDidWake()
</span><span class="lines">@@ -385,8 +376,9 @@
</span><span class="cx"> if (m_interrupted)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- for (auto* session : m_sessions)
- session->endInterruption(PlatformMediaSession::MayResumePlaying);
</del><ins>+ forEachSession([] (PlatformMediaSession& session, size_t) {
+ session.endInterruption(PlatformMediaSession::MayResumePlaying);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformMediaSessionManager::audioOutputDeviceChanged()
</span><span class="lines">@@ -396,20 +388,59 @@
</span><span class="cx">
</span><span class="cx"> void PlatformMediaSessionManager::stopAllMediaPlaybackForDocument(const Document* document)
</span><span class="cx"> {
</span><del>- Vector<PlatformMediaSession*> sessions = m_sessions;
- for (auto* session : sessions) {
- if (session->client().hostingDocument() == document)
- session->pauseSession();
- }
</del><ins>+ forEachSession([document] (PlatformMediaSession& session, size_t) {
+ if (session.client().hostingDocument() == document)
+ session.pauseSession();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformMediaSessionManager::stopAllMediaPlaybackForProcess()
</span><span class="cx"> {
</span><del>- Vector<PlatformMediaSession*> sessions = m_sessions;
- for (auto* session : sessions)
- session->stopSession();
</del><ins>+ forEachSession([] (PlatformMediaSession& session, size_t) {
+ session.stopSession();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void PlatformMediaSessionManager::forEachSession(std::function<void(PlatformMediaSession&, size_t)> func) const
+{
+ ++m_iteratingOverSessions;
+
+ for (size_t i = 0, size = m_sessions.size(); i < size; ++i) {
+ auto session = m_sessions[i];
+ if (!session)
+ continue;
+ func(*session, i);
+ }
+
+ --m_iteratingOverSessions;
+ if (!m_iteratingOverSessions)
+ m_sessions.removeAll(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+bool PlatformMediaSessionManager::anyOfSessions(std::function<bool(PlatformMediaSession&, size_t)> func) const
+{
+ ++m_iteratingOverSessions;
+
+ bool found = false;
+ for (size_t i = 0, size = m_sessions.size(); i < size; ++i) {
+ auto session = m_sessions[i];
+ if (!session)
+ continue;
+
+ if (!func(*session, i))
+ continue;
+
+ found = true;
+ break;
+ }
+
+ --m_iteratingOverSessions;
+ if (!m_iteratingOverSessions)
+ m_sessions.removeAll(nullptr);
+
+ return found;
+}
+
+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioPlatformMediaSessionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h (207687 => 207688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h 2016-10-21 18:32:04 UTC (rev 207687)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h 2016-10-21 18:37:47 UTC (rev 207688)
</span><span class="lines">@@ -120,6 +120,8 @@
</span><span class="cx"> friend class Internals;
</span><span class="cx">
</span><span class="cx"> void updateSessionState();
</span><ins>+ void forEachSession(std::function<void(PlatformMediaSession&, size_t)>) const;
+ bool anyOfSessions(std::function<bool(PlatformMediaSession&, size_t)>) const;
</ins><span class="cx">
</span><span class="cx"> // RemoteCommandListenerClient
</span><span class="cx"> WEBCORE_EXPORT void didReceiveRemoteControlCommand(PlatformMediaSession::RemoteControlCommandType, const PlatformMediaSession::RemoteCommandArgument*) override;
</span><span class="lines">@@ -135,7 +137,7 @@
</span><span class="cx"> void systemDidWake() override;
</span><span class="cx">
</span><span class="cx"> SessionRestrictions m_restrictions[PlatformMediaSession::WebAudio + 1];
</span><del>- Vector<PlatformMediaSession*> m_sessions;
</del><ins>+ mutable Vector<PlatformMediaSession*> m_sessions;
</ins><span class="cx"> std::unique_ptr<RemoteCommandListener> m_remoteCommandListener;
</span><span class="cx"> std::unique_ptr<SystemSleepListener> m_systemSleepListener;
</span><span class="cx"> RefPtr<AudioHardwareListener> m_audioHardwareListener;
</span><span class="lines">@@ -148,6 +150,7 @@
</span><span class="cx"> bool m_interrupted { false };
</span><span class="cx"> mutable bool m_isApplicationInBackground { false };
</span><span class="cx"> bool m_willIgnoreSystemInterruptions { false };
</span><ins>+ mutable int m_iteratingOverSessions { 0 };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>