Title: [170505] tags/Safari-538.43/Source/WebCore
- Revision
- 170505
- Author
- [email protected]
- Date
- 2014-06-26 16:43:58 -0700 (Thu, 26 Jun 2014)
Log Message
Merged r170485. <rdar://problem/16853657>
Modified Paths
Diff
Modified: tags/Safari-538.43/Source/WebCore/ChangeLog (170504 => 170505)
--- tags/Safari-538.43/Source/WebCore/ChangeLog 2014-06-26 23:17:55 UTC (rev 170504)
+++ tags/Safari-538.43/Source/WebCore/ChangeLog 2014-06-26 23:43:58 UTC (rev 170505)
@@ -1,3 +1,19 @@
+2014-06-26 Lucas Forschler <[email protected]>
+
+ Merge r170485
+
+ 2014-06-26 Eric Carlson <[email protected]>
+
+ [iOS] no need to deactivate audio session
+ https://bugs.webkit.org/show_bug.cgi?id=134350
+
+ Reviewed by Jer Noble.
+
+ * platform/audio/mac/MediaSessionManagerMac.cpp:
+ (MediaSessionManager::updateSessionState): Don't bother calling
+ AudioSession::setActive(false), WebCore's audio session will be deactivated
+ automatically if another application begins playing audio.
+
2014-06-26 Dean Jackson <[email protected]>
<rdar://problem/17446703> Disable features.
Modified: tags/Safari-538.43/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp (170504 => 170505)
--- tags/Safari-538.43/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp 2014-06-26 23:17:55 UTC (rev 170504)
+++ tags/Safari-538.43/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp 2014-06-26 23:43:58 UTC (rev 170505)
@@ -55,7 +55,8 @@
#endif
#if PLATFORM(IOS)
- AudioSession::sharedSession().setActive(hasActive());
+ if (hasActive())
+ AudioSession::sharedSession().setActive(true);
if (!Settings::shouldManageAudioSessionCategory())
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
