Title: [171299] trunk/Source/WebCore
- Revision
- 171299
- Author
- [email protected]
- Date
- 2014-07-21 08:03:11 -0700 (Mon, 21 Jul 2014)
Log Message
[iOS] a Paused media session is not active
https://bugs.webkit.org/show_bug.cgi?id=135108
Reviewed by Darin Adler.
Activating the shared AudioSession will pause audio playing in another application,
so only report a Playing media sessions as active.
* platform/audio/MediaSessionManager.cpp:
* platform/audio/MediaSessionManager.h:
(WebCore::MediaSessionManager::activeAudioSessionRequired): Renamed from hasActive to make
clear what it does. Only return true for a session that is Playing.
* platform/audio/mac/MediaSessionManagerMac.cpp:
(MediaSessionManager::updateSessionState): hasActive renamed to activeAudioSessionRequired.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (171298 => 171299)
--- trunk/Source/WebCore/ChangeLog 2014-07-21 09:38:26 UTC (rev 171298)
+++ trunk/Source/WebCore/ChangeLog 2014-07-21 15:03:11 UTC (rev 171299)
@@ -1,3 +1,21 @@
+2014-07-21 Eric Carlson <[email protected]>
+
+ [iOS] a Paused media session is not active
+ https://bugs.webkit.org/show_bug.cgi?id=135108
+
+ Reviewed by Darin Adler.
+
+ Activating the shared AudioSession will pause audio playing in another application,
+ so only report a Playing media sessions as active.
+
+ * platform/audio/MediaSessionManager.cpp:
+ * platform/audio/MediaSessionManager.h:
+ (WebCore::MediaSessionManager::activeAudioSessionRequired): Renamed from hasActive to make
+ clear what it does. Only return true for a session that is Playing.
+
+ * platform/audio/mac/MediaSessionManagerMac.cpp:
+ (MediaSessionManager::updateSessionState): hasActive renamed to activeAudioSessionRequired.
+
2014-07-21 Carlos Garcia Campos <[email protected]>
Unreviewed. Update GObject DOM bindings test results after r171285.
Modified: trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp (171298 => 171299)
--- trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp 2014-07-21 09:38:26 UTC (rev 171298)
+++ trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp 2014-07-21 15:03:11 UTC (rev 171299)
@@ -68,10 +68,10 @@
return false;
}
-bool MediaSessionManager::hasActive() const
+bool MediaSessionManager::activeAudioSessionRequired() const
{
for (auto* session : m_sessions) {
- if (session->mediaType() != MediaSession::None && (session->state() == MediaSession::State::Playing || session->state() == MediaSession::State::Paused))
+ if (session->mediaType() != MediaSession::None && session->state() == MediaSession::State::Playing)
return true;
}
Modified: trunk/Source/WebCore/platform/audio/MediaSessionManager.h (171298 => 171299)
--- trunk/Source/WebCore/platform/audio/MediaSessionManager.h 2014-07-21 09:38:26 UTC (rev 171298)
+++ trunk/Source/WebCore/platform/audio/MediaSessionManager.h 2014-07-21 15:03:11 UTC (rev 171299)
@@ -59,8 +59,8 @@
virtual ~MediaSessionManager() { }
bool has(MediaSession::MediaType) const;
- bool hasActive() const;
int count(MediaSession::MediaType) const;
+ bool activeAudioSessionRequired() const;
void beginInterruption(MediaSession::InterruptionType);
void endInterruption(MediaSession::EndInterruptionFlags);
Modified: trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp (171298 => 171299)
--- trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp 2014-07-21 09:38:26 UTC (rev 171298)
+++ trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp 2014-07-21 15:03:11 UTC (rev 171299)
@@ -62,7 +62,7 @@
#endif
#if PLATFORM(IOS)
- if (hasActive())
+ if (activeAudioSessionRequired())
AudioSession::sharedSession().setActive(true);
if (!Settings::shouldManageAudioSessionCategory())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
