<!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>[170370] 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/170370">170370</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-24 10:20:36 -0700 (Tue, 24 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't set AudioSession active while interrupted.
https://bugs.webkit.org/show_bug.cgi?id=134239
Patch by Jeremy Jones <jeremyj@apple.com> on 2014-06-24
Reviewed by Eric Carlson.
To activate the AudioSession there must be a session with audio or video
and being playing or paused.
* platform/audio/MediaSessionManager.cpp:
(WebCore::MediaSessionManager::hasActive): added
(WebCore::MediaSessionManager::beginInterruption): updateSessionState
(WebCore::MediaSessionManager::sessionWillBeginPlayback): updateSessionState
* platform/audio/MediaSessionManager.h: declare hasActive()
* platform/audio/mac/MediaSessionManagerMac.cpp:
(MediaSessionManager::updateSessionState): use hasActive()</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioMediaSessionManagercpp">trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioMediaSessionManagerh">trunk/Source/WebCore/platform/audio/MediaSessionManager.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiomacMediaSessionManagerMaccpp">trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170369 => 170370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-24 17:18:26 UTC (rev 170369)
+++ trunk/Source/WebCore/ChangeLog 2014-06-24 17:20:36 UTC (rev 170370)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-06-24 Jeremy Jones <jeremyj@apple.com>
+
+ Don't set AudioSession active while interrupted.
+ https://bugs.webkit.org/show_bug.cgi?id=134239
+
+ Reviewed by Eric Carlson.
+
+ To activate the AudioSession there must be a session with audio or video
+ and being playing or paused.
+
+ * platform/audio/MediaSessionManager.cpp:
+ (WebCore::MediaSessionManager::hasActive): added
+ (WebCore::MediaSessionManager::beginInterruption): updateSessionState
+ (WebCore::MediaSessionManager::sessionWillBeginPlayback): updateSessionState
+ * platform/audio/MediaSessionManager.h: declare hasActive()
+ * platform/audio/mac/MediaSessionManagerMac.cpp:
+ (MediaSessionManager::updateSessionState): use hasActive()
+
</ins><span class="cx"> 2014-06-24 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r170336): Crash in HTMLMediaElement::seekTimerFired()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp (170369 => 170370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp 2014-06-24 17:18:26 UTC (rev 170369)
+++ trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp 2014-06-24 17:20:36 UTC (rev 170370)
</span><span class="lines">@@ -68,6 +68,16 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool MediaSessionManager::hasActive() const
+{
+ for (auto* session : m_sessions) {
+ if (session->mediaType() != MediaSession::None && (session->state() == MediaSession::State::Playing || session->state() == MediaSession::State::Paused))
+ return true;
+ }
+
+ return false;
+}
+
</ins><span class="cx"> int MediaSessionManager::count(MediaSession::MediaType type) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(type >= MediaSession::None && type <= MediaSession::WebAudio);
</span><span class="lines">@@ -89,6 +99,7 @@
</span><span class="cx"> Vector<MediaSession*> sessions = m_sessions;
</span><span class="cx"> for (auto* session : sessions)
</span><span class="cx"> session->beginInterruption(type);
</span><ins>+ updateSessionState();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaSessionManager::endInterruption(MediaSession::EndInterruptionFlags flags)
</span><span class="lines">@@ -185,6 +196,8 @@
</span><span class="cx"> if (restrictions & ConcurrentPlaybackNotPermitted)
</span><span class="cx"> oneSession->pauseSession();
</span><span class="cx"> }
</span><ins>+
+ updateSessionState();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaSessionManager::sessionWillEndPlayback(MediaSession& session)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioMediaSessionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSessionManager.h (170369 => 170370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSessionManager.h 2014-06-24 17:18:26 UTC (rev 170369)
+++ trunk/Source/WebCore/platform/audio/MediaSessionManager.h 2014-06-24 17:20:36 UTC (rev 170370)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> virtual ~MediaSessionManager() { }
</span><span class="cx">
</span><span class="cx"> bool has(MediaSession::MediaType) const;
</span><ins>+ bool hasActive() const;
</ins><span class="cx"> int count(MediaSession::MediaType) const;
</span><span class="cx">
</span><span class="cx"> void beginInterruption(MediaSession::InterruptionType);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiomacMediaSessionManagerMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp (170369 => 170370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp 2014-06-24 17:18:26 UTC (rev 170369)
+++ trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp 2014-06-24 17:20:36 UTC (rev 170370)
</span><span class="lines">@@ -55,10 +55,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- if (has(MediaSession::WebAudio) || has(MediaSession::Video) || has(MediaSession::Audio))
- AudioSession::sharedSession().setActive(true);
- else
- AudioSession::sharedSession().setActive(false);
</del><ins>+ AudioSession::sharedSession().setActive(hasActive());
</ins><span class="cx">
</span><span class="cx"> if (!Settings::shouldManageAudioSessionCategory())
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>