Changeset 250694 in webkit

Timestamp:

Oct 3, 2019 6:09:43 PM (5 years ago)

Author:

jer.noble@apple.com

Message:

[iOS] WebContent process can be interrupted during suspension; loses "Now Playing" status
​https://bugs.webkit.org/show_bug.cgi?id=202537
<rdar://problem/55952707>

Reviewed by Eric Carlson.

Always deactivate the AVAudioSession when the last playing PlatformAudioSession ends playback and the application is in the background.

• platform/audio/PlatformMediaSessionManager.cpp: (WebCore::PlatformMediaSessionManager::removeSession): (WebCore::PlatformMediaSessionManager::processWillSuspend): (WebCore::PlatformMediaSessionManager::maybeDeactivateAudioSession):
• platform/audio/PlatformMediaSessionManager.h: (WebCore::PlatformMediaSessionManager::isApplicationInBackground const):
• platform/audio/ios/MediaSessionManagerIOS.h:
• platform/audio/ios/MediaSessionManagerIOS.mm: (WebCore::MediaSessionManageriOS::sessionWillEndPlayback):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/audio/PlatformMediaSessionManager.cpp (modified) (4 diffs)
• platform/audio/PlatformMediaSessionManager.h (modified) (1 diff)
• platform/audio/ios/MediaSessionManagerIOS.h (modified) (1 diff)
• platform/audio/ios/MediaSessionManagerIOS.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-10-03  Jer Noble  <jer.noble@apple.com>
+
+    [iOS] WebContent process can be interrupted during suspension; loses "Now Playing" status
+    https://bugs.webkit.org/show_bug.cgi?id=202537
+    <rdar://problem/55952707>
+
+    Reviewed by Eric Carlson.
+
+    Always deactivate the AVAudioSession when the last playing PlatformAudioSession ends playback and the application is in the background.
+
+    * platform/audio/PlatformMediaSessionManager.cpp:
+    (WebCore::PlatformMediaSessionManager::removeSession):
+    (WebCore::PlatformMediaSessionManager::processWillSuspend):
+    (WebCore::PlatformMediaSessionManager::maybeDeactivateAudioSession):
+    * platform/audio/PlatformMediaSessionManager.h:
+    (WebCore::PlatformMediaSessionManager::isApplicationInBackground const):
+    * platform/audio/ios/MediaSessionManagerIOS.h:
+    * platform/audio/ios/MediaSessionManagerIOS.mm:
+    (WebCore::MediaSessionManageriOS::sessionWillEndPlayback):
+
 2019-10-03  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp

@@ -167 +167 @@
         m_audioHardwareListener = nullptr;
 #if USE(AUDIO_SESSION)
-        if (m_becameActive && shouldDeactivateAudioSession()) {
-            AudioSession::sharedSession().tryToSetActive(false);
-            m_becameActive = false;
-        }
+        maybeDeactivateAudioSession();
 #endif
     }
@@ -364 +361 @@
     m_processIsSuspended = true;
 
+    ALWAYS_LOG(LOGIDENTIFIER);
+
     forEachSession([&] (auto& session) {
         session.client().processIsSuspendedChanged();
@@ -369 +368 @@
 
 #if USE(AUDIO_SESSION)
-    if (m_becameActive && shouldDeactivateAudioSession()) {
-        AudioSession::sharedSession().tryToSetActive(false);
-        ALWAYS_LOG(LOGIDENTIFIER, "tried to set inactive AudioSession");
-        m_becameActive = false;
-    }
+    maybeDeactivateAudioSession();
 #endif
 }
@@ -546 +541 @@
 }
 
+#if USE(AUDIO_SESSION)
+void PlatformMediaSessionManager::maybeDeactivateAudioSession()
+{
+    if (!m_becameActive || !shouldDeactivateAudioSession())
+        return;
+
+    ALWAYS_LOG(LOGIDENTIFIER, "tried to set inactive AudioSession");
+    AudioSession::sharedSession().tryToSetActive(false);
+    m_becameActive = false;
+}
+#endif
+
 static bool& deactivateAudioSession()
 {

trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h

@@ -150 +150 @@
     AudioHardwareListener* audioHardwareListener() { return m_audioHardwareListener.get(); }
 
+    bool isApplicationInBackground() const { return m_isApplicationInBackground; }
+#if USE(AUDIO_SESSION)
+    void maybeDeactivateAudioSession();
+#endif
+
 #if !RELEASE_LOG_DISABLED
     const Logger& logger() const final { return m_logger; }

trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h

@@ -63 +63 @@
     void configureWireLessTargetMonitoring() override;
     void providePresentingApplicationPIDIfNecessary() final;
+    void sessionWillEndPlayback(PlatformMediaSession&) final;
 
 #if !RELEASE_LOG_DISABLED

trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm

@@ -191 +191 @@
 }
 
+void MediaSessionManageriOS::sessionWillEndPlayback(PlatformMediaSession& session)
+{
+    MediaSessionManagerCocoa::sessionWillEndPlayback(session);
+
+#if USE(AUDIO_SESSION)
+    if (isApplicationInBackground() && !anyOfSessions([] (auto& session) { return session.state() == PlatformMediaSession::Playing; }))
+        maybeDeactivateAudioSession();
+#endif
+}
+
 void MediaSessionManageriOS::externalOutputDeviceAvailableDidChange()
 {