Changeset 256904 in webkit

Timestamp:

Feb 18, 2020 8:50:31 PM (4 years ago)

Author:

youenn@apple.com

Message:

Reduce use of PlatformMediaSessionManager::sharedManager()
​https://bugs.webkit.org/show_bug.cgi?id=207924

Reviewed by Eric Carlson.

The plan is to be able to have PlatformMediaSession in GPU process which might have different managers,
typically a manager per connection to web process.
For that reason, reduce the use of the sharedManager to classes that can only live in WebProcess.
No change of behavior.

• Modules/mediastream/MediaStreamTrack.cpp:

(WebCore::MediaStreamTrack::MediaStreamTrack):

• Modules/webaudio/AudioContext.cpp:

(WebCore::AudioContext::AudioContext):

• html/MediaElementSession.cpp:

(WebCore::MediaElementSession::MediaElementSession):
(WebCore::MediaElementSession::clientDataBufferingTimerFired):
(WebCore::MediaElementSession::setHasPlaybackTargetAvailabilityListeners):

• platform/audio/PlatformMediaSession.cpp:

(WebCore::PlatformMediaSession::create):
(WebCore::PlatformMediaSession::PlatformMediaSession):
(WebCore::PlatformMediaSession::~PlatformMediaSession):
(WebCore::PlatformMediaSession::setState):
(WebCore::PlatformMediaSession::clientWillBeginPlayback):
(WebCore::PlatformMediaSession::processClientWillPausePlayback):
(WebCore::PlatformMediaSession::stopSession):
(WebCore::PlatformMediaSession::isPlayingToWirelessPlaybackTargetChanged):
(WebCore::PlatformMediaSession::canProduceAudioChanged):
(WebCore::PlatformMediaSession::clientCharacteristicsChanged):
(WebCore::PlatformMediaSession::manager):

• platform/audio/PlatformMediaSession.h:
• platform/audio/PlatformMediaSessionManager.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/MediaStreamTrack.cpp (modified) (2 diffs)
• Modules/webaudio/AudioContext.cpp (modified) (3 diffs)
• html/MediaElementSession.cpp (modified) (4 diffs)
• platform/audio/PlatformMediaSession.cpp (modified) (10 diffs)
• platform/audio/PlatformMediaSession.h (modified) (3 diffs)
• platform/audio/PlatformMediaSessionManager.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-02-18  Youenn Fablet  <youenn@apple.com>
+
+        Reduce use of PlatformMediaSessionManager::sharedManager()
+        https://bugs.webkit.org/show_bug.cgi?id=207924
+
+        Reviewed by Eric Carlson.
+
+        The plan is to be able to have PlatformMediaSession in GPU process which might have different managers,
+        typically a manager per connection to web process.
+        For that reason, reduce the use of the sharedManager to classes that can only live in WebProcess.
+        No change of behavior.
+
+        * Modules/mediastream/MediaStreamTrack.cpp:
+        (WebCore::MediaStreamTrack::MediaStreamTrack):
+        * Modules/webaudio/AudioContext.cpp:
+        (WebCore::AudioContext::AudioContext):
+        * html/MediaElementSession.cpp:
+        (WebCore::MediaElementSession::MediaElementSession):
+        (WebCore::MediaElementSession::clientDataBufferingTimerFired):
+        (WebCore::MediaElementSession::setHasPlaybackTargetAvailabilityListeners):
+        * platform/audio/PlatformMediaSession.cpp:
+        (WebCore::PlatformMediaSession::create):
+        (WebCore::PlatformMediaSession::PlatformMediaSession):
+        (WebCore::PlatformMediaSession::~PlatformMediaSession):
+        (WebCore::PlatformMediaSession::setState):
+        (WebCore::PlatformMediaSession::clientWillBeginPlayback):
+        (WebCore::PlatformMediaSession::processClientWillPausePlayback):
+        (WebCore::PlatformMediaSession::stopSession):
+        (WebCore::PlatformMediaSession::isPlayingToWirelessPlaybackTargetChanged):
+        (WebCore::PlatformMediaSession::canProduceAudioChanged):
+        (WebCore::PlatformMediaSession::clientCharacteristicsChanged):
+        (WebCore::PlatformMediaSession::manager):
+        * platform/audio/PlatformMediaSession.h:
+        * platform/audio/PlatformMediaSessionManager.h:
+
 2020-02-18  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp

@@ -46 +46 @@
 #include "OverconstrainedError.h"
 #include "Page.h"
+#include "PlatformMediaSessionManager.h"
 #include "RealtimeMediaSourceCenter.h"
 #include "ScriptExecutionContext.h"
@@ -75 +76 @@
     , m_private(WTFMove(privateTrack))
     , m_isCaptureTrack(m_private->isCaptureTrack())
-    , m_mediaSession(PlatformMediaSession::create(*this))
+    , m_mediaSession(PlatformMediaSession::create(PlatformMediaSessionManager::sharedManager(), *this))
 {
     ALWAYS_LOG(LOGIDENTIFIER);

trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp

@@ -64 +64 @@
 #include "PannerNode.h"
 #include "PeriodicWave.h"
+#include "PlatformMediaSessionManager.h"
 #include "ScriptController.h"
 #include "ScriptProcessorNode.h"
@@ -140 +141 @@
     , m_logIdentifier(uniqueLogIdentifier())
 #endif
-    , m_mediaSession(PlatformMediaSession::create(*this))
+    , m_mediaSession(PlatformMediaSession::create(PlatformMediaSessionManager::sharedManager(), *this))
     , m_eventQueue(MainThreadGenericEventQueue::create(*this))
 {
@@ -166 +167 @@
 #endif
     , m_isOfflineContext(true)
-    , m_mediaSession(PlatformMediaSession::create(*this))
+    , m_mediaSession(PlatformMediaSession::create(PlatformMediaSessionManager::sharedManager(), *this))
     , m_eventQueue(MainThreadGenericEventQueue::create(*this))
     , m_renderTarget(renderTarget)

trunk/Source/WebCore/html/MediaElementSession.cpp

@@ -106 +106 @@
 
 MediaElementSession::MediaElementSession(HTMLMediaElement& element)
-    : PlatformMediaSession(element)
+    : PlatformMediaSession(PlatformMediaSessionManager::sharedManager(), element)
     , m_element(element)
     , m_restrictions(NoRestrictions)
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
     , m_targetAvailabilityChangedTimer(*this, &MediaElementSession::targetAvailabilityChangedTimerFired)
-    , m_hasPlaybackTargets(PlatformMediaSessionManager::sharedManager().hasWirelessTargetsAvailable())
+    , m_hasPlaybackTargets(manager().hasWirelessTargetsAvailable())
 #endif
     , m_mainContentCheckTimer(*this, &MediaElementSession::mainContentCheckTimerFired)
@@ -202 +202 @@
 
 #if PLATFORM(IOS_FAMILY)
-    PlatformMediaSessionManager::sharedManager().configureWireLessTargetMonitoring();
+    manager().configureWireLessTargetMonitoring();
 #endif
 
@@ -208 +208 @@
         return;
 
-    PlatformMediaSessionManager::SessionRestrictions restrictions = PlatformMediaSessionManager::sharedManager().restrictions(mediaType());
+    PlatformMediaSessionManager::SessionRestrictions restrictions = manager().restrictions(mediaType());
     if ((restrictions & PlatformMediaSessionManager::BackgroundTabPlaybackRestricted) == PlatformMediaSessionManager::BackgroundTabPlaybackRestricted)
         pauseSession();
@@ -637 +637 @@
 #if PLATFORM(IOS_FAMILY)
     m_hasPlaybackTargetAvailabilityListeners = hasListeners;
-    PlatformMediaSessionManager::sharedManager().configureWireLessTargetMonitoring();
+    manager().configureWireLessTargetMonitoring();
 #else
     UNUSED_PARAM(hasListeners);

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

@@ -108 +108 @@
 #endif
 
-std::unique_ptr<PlatformMediaSession> PlatformMediaSession::create(PlatformMediaSessionClient& client)
-{
-    return makeUnique<PlatformMediaSession>(client);
-}
-
-PlatformMediaSession::PlatformMediaSession(PlatformMediaSessionClient& client)
-    : m_client(client)
+std::unique_ptr<PlatformMediaSession> PlatformMediaSession::create(PlatformMediaSessionManager& manager, PlatformMediaSessionClient& client)
+{
+    return std::unique_ptr<PlatformMediaSession>(new PlatformMediaSession(manager, client));
+}
+
+PlatformMediaSession::PlatformMediaSession(PlatformMediaSessionManager& manager, PlatformMediaSessionClient& client)
+    : m_manager(makeWeakPtr(manager))
+    , m_client(client)
     , m_state(Idle)
     , m_stateToRestore(Idle)
@@ -124 +125 @@
 {
     ASSERT(m_client.mediaType() >= None && m_client.mediaType() <= MediaStreamCapturingAudio);
-    PlatformMediaSessionManager::sharedManager().addSession(*this);
+    manager.addSession(*this);
 }
 
 PlatformMediaSession::~PlatformMediaSession()
 {
-    PlatformMediaSessionManager::sharedManager().removeSession(*this);
+    if (m_manager)
+        m_manager->removeSession(*this);
 }
 
@@ -141 +143 @@
     if (m_state == State::Playing)
         m_hasPlayedSinceLastInterruption = true;
-    PlatformMediaSessionManager::sharedManager().sessionStateChanged(*this);
+    m_manager->sessionStateChanged(*this);
 }
 
@@ -215 +217 @@
     INFO_LOG(LOGIDENTIFIER, "state = ", m_state);
 
-    if (!PlatformMediaSessionManager::sharedManager().sessionWillBeginPlayback(*this)) {
+    if (!m_manager->sessionWillBeginPlayback(*this)) {
         if (state() == Interrupted)
             m_stateToRestore = Playing;
@@ -238 +240 @@
     
     setState(Paused);
-    PlatformMediaSessionManager::sharedManager().sessionWillEndPlayback(*this, shouldDelayCallingUpdateNowPlaying);
+    m_manager->sessionWillEndPlayback(*this, shouldDelayCallingUpdateNowPlaying);
     return true;
 }
@@ -262 +264 @@
     INFO_LOG(LOGIDENTIFIER);
     m_client.suspendPlayback();
-    PlatformMediaSessionManager::sharedManager().removeSession(*this);
+    m_manager->removeSession(*this);
 }
 
@@ -344 +346 @@
     // if we in the background.
     int interruptionCount = m_interruptionCount;
-    PlatformMediaSessionManager::sharedManager().sessionIsPlayingToWirelessPlaybackTargetChanged(*this);
+    m_manager->sessionIsPlayingToWirelessPlaybackTargetChanged(*this);
     m_interruptionCount = interruptionCount;
 }
@@ -369 +371 @@
 void PlatformMediaSession::canProduceAudioChanged()
 {
-    PlatformMediaSessionManager::sharedManager().sessionCanProduceAudioChanged();
+    m_manager->sessionCanProduceAudioChanged();
 }
 
@@ -396 +398 @@
 void PlatformMediaSession::clientCharacteristicsChanged()
 {
-    PlatformMediaSessionManager::sharedManager().clientCharacteristicsChanged(*this);
+    m_manager->clientCharacteristicsChanged(*this);
 }
 
@@ -407 +409 @@
 {
     return m_client.shouldOverridePauseDuringRouteChange();
+}
+
+PlatformMediaSessionManager& PlatformMediaSession::manager()
+{
+    return *m_manager;
 }
 

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

@@ -42 +42 @@
 class MediaPlaybackTarget;
 class PlatformMediaSessionClient;
+class PlatformMediaSessionManager;
 enum class DelayCallingUpdateNowPlaying { No, Yes };
 
@@ -55 +56 @@
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    static std::unique_ptr<PlatformMediaSession> create(PlatformMediaSessionClient&);
-
-    PlatformMediaSession(PlatformMediaSessionClient&);
+    static std::unique_ptr<PlatformMediaSession> create(PlatformMediaSessionManager&, PlatformMediaSessionClient&);
+
     virtual ~PlatformMediaSession();
 
@@ -200 +200 @@
 
 protected:
+    PlatformMediaSession(PlatformMediaSessionManager&, PlatformMediaSessionClient&);
     PlatformMediaSessionClient& client() const { return m_client; }
+
+    PlatformMediaSessionManager& manager();
 
 private:
     bool processClientWillPausePlayback(DelayCallingUpdateNowPlaying);
 
+    WeakPtr<PlatformMediaSessionManager> m_manager;
     PlatformMediaSessionClient& m_client;
     State m_state;

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

@@ -35 +35 @@
 #include <wtf/AggregateLogger.h>
 #include <wtf/Vector.h>
+#include <wtf/WeakPtr.h>
 
 namespace WebCore {
@@ -48 +49 @@
     , private LoggerHelper
 #endif
+    , public CanMakeWeakPtr<PlatformMediaSessionManager>
 {
     WTF_MAKE_FAST_ALLOCATED;