Changeset 185223 in webkit


Ignore:
Timestamp:
Jun 4, 2015 3:37:25 PM (9 years ago)
Author:
commit-queue@webkit.org
Message:

Rename MediaSessionManager to PlatformMediaSessionManager for consistency with PlatformMediaSession.
​https://bugs.webkit.org/show_bug.cgi?id=145648

Patch by Matt Rajca <​mrajca@apple.com> on 2015-06-04
Reviewed by Eric Carlson.

  • WebCore.vcxproj/WebCore.vcxproj:
  • WebCore.vcxproj/WebCore.vcxproj.filters:
  • WebCore.xcodeproj/project.pbxproj:
  • html/HTMLMediaElement.cpp:
  • html/MediaElementSession.cpp:

(WebCore::MediaElementSession::effectivePreloadForElement):
(WebCore::MediaElementSession::requiresFullscreenForVideoPlayback):

  • platform/audio/PlatformMediaSession.cpp:

(WebCore::PlatformMediaSession::PlatformMediaSession):
(WebCore::PlatformMediaSession::~PlatformMediaSession):
(WebCore::PlatformMediaSession::clientWillBeginPlayback):
(WebCore::PlatformMediaSession::clientWillPausePlayback):
(WebCore::PlatformMediaSession::clientDataBufferingTimerFired):
(WebCore::PlatformMediaSession::updateClientDataBuffering):

  • platform/audio/PlatformMediaSessionManager.cpp: Renamed from Source/WebCore/platform/audio/MediaSessionManager.cpp.

(WebCore::PlatformMediaSessionManager::sharedManager):
(WebCore::PlatformMediaSessionManager::PlatformMediaSessionManager):
(WebCore::PlatformMediaSessionManager::resetRestrictions):
(WebCore::PlatformMediaSessionManager::has):
(WebCore::PlatformMediaSessionManager::activeAudioSessionRequired):
(WebCore::PlatformMediaSessionManager::count):
(WebCore::PlatformMediaSessionManager::beginInterruption):
(WebCore::PlatformMediaSessionManager::endInterruption):
(WebCore::PlatformMediaSessionManager::addSession):
(WebCore::PlatformMediaSessionManager::removeSession):
(WebCore::PlatformMediaSessionManager::addRestriction):
(WebCore::PlatformMediaSessionManager::removeRestriction):
(WebCore::PlatformMediaSessionManager::restrictions):
(WebCore::PlatformMediaSessionManager::sessionWillBeginPlayback):
(WebCore::PlatformMediaSessionManager::sessionWillEndPlayback):
(WebCore::PlatformMediaSessionManager::setCurrentSession):
(WebCore::PlatformMediaSessionManager::currentSession):
(WebCore::PlatformMediaSessionManager::sessionRestrictsInlineVideoPlayback):
(WebCore::PlatformMediaSessionManager::sessionCanLoadMedia):
(WebCore::PlatformMediaSessionManager::applicationWillEnterBackground):
(WebCore::PlatformMediaSessionManager::applicationWillEnterForeground):
(WebCore::PlatformMediaSessionManager::updateSessionState):
(WebCore::PlatformMediaSessionManager::didReceiveRemoteControlCommand):
(WebCore::PlatformMediaSessionManager::systemWillSleep):
(WebCore::PlatformMediaSessionManager::systemDidWake):
(WebCore::PlatformMediaSessionManager::audioOutputDeviceChanged):

  • platform/audio/PlatformMediaSessionManager.h: Renamed from Source/WebCore/platform/audio/MediaSessionManager.h.

(WebCore::PlatformMediaSessionManager::~PlatformMediaSessionManager):
(WebCore::PlatformMediaSessionManager::configureWireLessTargetMonitoring):
(WebCore::PlatformMediaSessionManager::hasWirelessTargetsAvailable):
(WebCore::PlatformMediaSessionManager::sessions):

  • platform/audio/mac/AudioDestinationMac.cpp:
  • platform/audio/mac/MediaSessionManagerMac.cpp:

(PlatformMediaSessionManager::updateSessionState):
(MediaSessionManager::updateSessionState): Deleted.

  • testing/Internals.cpp:
Location:
trunk/Source/WebCore
Files:
13 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r185179 r185223  
    21122112    platform/audio/HRTFKernel.cpp
    21132113    platform/audio/HRTFPanner.cpp
    2114     platform/audio/MediaSessionManager.cpp
    21152114    platform/audio/MultiChannelResampler.cpp
    21162115    platform/audio/Panner.cpp
    21172116    platform/audio/PlatformMediaSession.cpp
     2117    platform/audio/PlatformMediaSessionManager.cpp
    21182118    platform/audio/Reverb.cpp
    21192119    platform/audio/ReverbAccumulationBuffer.cpp

  • trunk/Source/WebCore/ChangeLog

    r185220 r185223  
     12015-06-04  Matt Rajca  <mrajca@apple.com>
     2
     3        Rename MediaSessionManager to PlatformMediaSessionManager for consistency with PlatformMediaSession.
     4        https://bugs.webkit.org/show_bug.cgi?id=145648
     5
     6        Reviewed by Eric Carlson.
     7
     8        * WebCore.vcxproj/WebCore.vcxproj:
     9        * WebCore.vcxproj/WebCore.vcxproj.filters:
     10        * WebCore.xcodeproj/project.pbxproj:
     11        * html/HTMLMediaElement.cpp:
     12        * html/MediaElementSession.cpp:
     13        (WebCore::MediaElementSession::effectivePreloadForElement):
     14        (WebCore::MediaElementSession::requiresFullscreenForVideoPlayback):
     15        * platform/audio/PlatformMediaSession.cpp:
     16        (WebCore::PlatformMediaSession::PlatformMediaSession):
     17        (WebCore::PlatformMediaSession::~PlatformMediaSession):
     18        (WebCore::PlatformMediaSession::clientWillBeginPlayback):
     19        (WebCore::PlatformMediaSession::clientWillPausePlayback):
     20        (WebCore::PlatformMediaSession::clientDataBufferingTimerFired):
     21        (WebCore::PlatformMediaSession::updateClientDataBuffering):
     22        * platform/audio/PlatformMediaSessionManager.cpp: Renamed from Source/WebCore/platform/audio/MediaSessionManager.cpp.
     23        (WebCore::PlatformMediaSessionManager::sharedManager):
     24        (WebCore::PlatformMediaSessionManager::PlatformMediaSessionManager):
     25        (WebCore::PlatformMediaSessionManager::resetRestrictions):
     26        (WebCore::PlatformMediaSessionManager::has):
     27        (WebCore::PlatformMediaSessionManager::activeAudioSessionRequired):
     28        (WebCore::PlatformMediaSessionManager::count):
     29        (WebCore::PlatformMediaSessionManager::beginInterruption):
     30        (WebCore::PlatformMediaSessionManager::endInterruption):
     31        (WebCore::PlatformMediaSessionManager::addSession):
     32        (WebCore::PlatformMediaSessionManager::removeSession):
     33        (WebCore::PlatformMediaSessionManager::addRestriction):
     34        (WebCore::PlatformMediaSessionManager::removeRestriction):
     35        (WebCore::PlatformMediaSessionManager::restrictions):
     36        (WebCore::PlatformMediaSessionManager::sessionWillBeginPlayback):
     37        (WebCore::PlatformMediaSessionManager::sessionWillEndPlayback):
     38        (WebCore::PlatformMediaSessionManager::setCurrentSession):
     39        (WebCore::PlatformMediaSessionManager::currentSession):
     40        (WebCore::PlatformMediaSessionManager::sessionRestrictsInlineVideoPlayback):
     41        (WebCore::PlatformMediaSessionManager::sessionCanLoadMedia):
     42        (WebCore::PlatformMediaSessionManager::applicationWillEnterBackground):
     43        (WebCore::PlatformMediaSessionManager::applicationWillEnterForeground):
     44        (WebCore::PlatformMediaSessionManager::updateSessionState):
     45        (WebCore::PlatformMediaSessionManager::didReceiveRemoteControlCommand):
     46        (WebCore::PlatformMediaSessionManager::systemWillSleep):
     47        (WebCore::PlatformMediaSessionManager::systemDidWake):
     48        (WebCore::PlatformMediaSessionManager::audioOutputDeviceChanged):
     49        * platform/audio/PlatformMediaSessionManager.h: Renamed from Source/WebCore/platform/audio/MediaSessionManager.h.
     50        (WebCore::PlatformMediaSessionManager::~PlatformMediaSessionManager):
     51        (WebCore::PlatformMediaSessionManager::configureWireLessTargetMonitoring):
     52        (WebCore::PlatformMediaSessionManager::hasWirelessTargetsAvailable):
     53        (WebCore::PlatformMediaSessionManager::sessions):
     54        * platform/audio/mac/AudioDestinationMac.cpp:
     55        * platform/audio/mac/MediaSessionManagerMac.cpp:
     56        (PlatformMediaSessionManager::updateSessionState):
     57        (MediaSessionManager::updateSessionState): Deleted.
     58        * testing/Internals.cpp:
     59
    1602015-06-04  Eric Carlson  <eric.carlson@apple.com>
    261

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r185196 r185223  
    73977397    <ClCompile Include="..\platform\audio\AudioSession.cpp" />
    73987398    <ClCompile Include="..\platform\audio\PlatformMediaSession.cpp" />
    7399     <ClCompile Include="..\platform\audio\MediaSessionManager.cpp" />
     7399    <ClCompile Include="..\platform\audio\PlatformMediaSessionManager.cpp" />
    74007400    <ClCompile Include="..\platform\graphics\ANGLEWebKitBridge.cpp" />
    74017401    <ClCompile Include="..\platform\graphics\avfoundation\cf\InbandTextTrackPrivateAVCF.cpp" />

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

    r185196 r185223  
    70557055      <Filter>platform\audio</Filter>
    70567056    </ClCompile>
    7057     <ClCompile Include="..\platform\audio\MediaSessionManager.cpp">
     7057    <ClCompile Include="..\platform\audio\PlatformMediaSessionManager.cpp">
    70587058      <Filter>platform\audio</Filter>
    70597059    </ClCompile>

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r185196 r185223  
    350350                07F0B97C1AC5DB4600E535D9 /* AVFoundationSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 07F0B97B1AC5DB4600E535D9 /* AVFoundationSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
    351351                07F876841AD580F900905849 /* MediaPlaybackTargetContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 07F876831AD4A94500905849 /* MediaPlaybackTargetContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
    352                 07F944161864D046005D31CB /* MediaSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CDAE8C081746B95700532D78 /* MediaSessionManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
     352                07F944161864D046005D31CB /* PlatformMediaSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CDAE8C081746B95700532D78 /* PlatformMediaSessionManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
    353353                07FBDE2C18FED178001A7CFF /* JSDataCueCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07FBDE2B18FED178001A7CFF /* JSDataCueCustom.cpp */; };
    354354                07FE99DC18807A7D00256648 /* MediaElementSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07FE99DA18807A7D00256648 /* MediaElementSession.cpp */; };
    … …  
    58075807                CDAB6D3117C9259500C60B34 /* UserAgentScripts.h in Headers */ = {isa = PBXBuildFile; fileRef = CDAB6D2F17C9259500C60B34 /* UserAgentScripts.h */; };
    58085808                CDAB6D3217C9259500C60B34 /* UserAgentScriptsData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDAB6D3017C9259500C60B34 /* UserAgentScriptsData.cpp */; };
    5809                 CDAE8C091746B95700532D78 /* MediaSessionManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDAE8C071746B95700532D78 /* MediaSessionManager.cpp */; };
     5809                CDAE8C091746B95700532D78 /* PlatformMediaSessionManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDAE8C071746B95700532D78 /* PlatformMediaSessionManager.cpp */; };
    58105810                CDB859F7160D48A400E5B07F /* MediaKeyEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDB859F4160D489900E5B07F /* MediaKeyEvent.cpp */; };
    58115811                CDB859FA160D494900E5B07F /* JSMediaKeyEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDB859F8160D493E00E5B07F /* JSMediaKeyEvent.cpp */; };
    … …  
    1341113411                CDAB6D2F17C9259500C60B34 /* UserAgentScripts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserAgentScripts.h; sourceTree = "<group>"; };
    1341213412                CDAB6D3017C9259500C60B34 /* UserAgentScriptsData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserAgentScriptsData.cpp; sourceTree = "<group>"; };
    13413                 CDAE8C071746B95700532D78 /* MediaSessionManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaSessionManager.cpp; sourceTree = "<group>"; };
    13414                 CDAE8C081746B95700532D78 /* MediaSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaSessionManager.h; sourceTree = "<group>"; };
     13413                CDAE8C071746B95700532D78 /* PlatformMediaSessionManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformMediaSessionManager.cpp; sourceTree = "<group>"; };
     13414                CDAE8C081746B95700532D78 /* PlatformMediaSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformMediaSessionManager.h; sourceTree = "<group>"; };
    1341513415                CDB859F2160D489900E5B07F /* MediaKeyError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaKeyError.h; sourceTree = "<group>"; };
    1341613416                CDB859F3160D489900E5B07F /* MediaKeyError.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MediaKeyError.idl; sourceTree = "<group>"; };
    … …  
    2359523595                                FD31606A12B026F700C1A359 /* HRTFPanner.cpp */,
    2359623596                                FD31606B12B026F700C1A359 /* HRTFPanner.h */,
    23597                                 CDAE8C071746B95700532D78 /* MediaSessionManager.cpp */,
    23598                                 CDAE8C081746B95700532D78 /* MediaSessionManager.h */,
    2359923597                                FDB1700314A2BAB200A2B5D9 /* MultiChannelResampler.cpp */,
    2360023598                                FDB1700414A2BAB200A2B5D9 /* MultiChannelResampler.h */,
    … …  
    2360323601                                070E091A1875EF71003A1D3C /* PlatformMediaSession.cpp */,
    2360423602                                070E09181875ED93003A1D3C /* PlatformMediaSession.h */,
     23603                                CDAE8C071746B95700532D78 /* PlatformMediaSessionManager.cpp */,
     23604                                CDAE8C081746B95700532D78 /* PlatformMediaSessionManager.h */,
    2360523605                                FD31606E12B026F700C1A359 /* Reverb.cpp */,
    2360623606                                FD31606F12B026F700C1A359 /* Reverb.h */,
    … …  
    2585125851                                CDBEAEAD19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.h in Headers */,
    2585225852                                C9027F421B1D0AD200BFBFEF /* MediaSession.h in Headers */,
    25853                                 07F944161864D046005D31CB /* MediaSessionManager.h in Headers */,
    2585425853                                07638A991884487200E15A1B /* MediaSessionManagerIOS.h in Headers */,
    2585525854                                CD3A495F17A9D01B00274E42 /* MediaSource.h in Headers */,
    … …  
    2607526074                                CEEFCD7C19DB33DC003876D7 /* PlatformMediaResourceLoader.h in Headers */,
    2607626075                                070E09191875EEFC003A1D3C /* PlatformMediaSession.h in Headers */,
     26076                                07F944161864D046005D31CB /* PlatformMediaSessionManager.h in Headers */,
    2607726077                                932871C00B20DEB70049035A /* PlatformMenuDescription.h in Headers */,
    2607826078                                41BF70100FE86F61005E8DEC /* PlatformMessagePortChannel.h in Headers */,
    … …  
    2943729437                                CDBEAEAC19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.mm in Sources */,
    2943829438                                C9027F411B1D0AD200BFBFEF /* MediaSession.cpp in Sources */,
    29439                                 CDAE8C091746B95700532D78 /* MediaSessionManager.cpp in Sources */,
    2944029439                                07638A9A1884487200E15A1B /* MediaSessionManagerIOS.mm in Sources */,
    2944129440                                07EDC3EE1AACB75D00983EB5 /* MediaSessionManagerMac.cpp in Sources */,
    … …  
    2960829607                                F544F78815CFB2A800AF33A8 /* PlatformLocale.cpp in Sources */,
    2960929608                                070E091B1875EF71003A1D3C /* PlatformMediaSession.cpp in Sources */,
     29609                                CDAE8C091746B95700532D78 /* PlatformMediaSessionManager.cpp in Sources */,
    2961029610                                41BF700F0FE86F61005E8DEC /* PlatformMessagePortChannel.cpp in Sources */,
    2961129611                                C5278B0C17F212EA003A2998 /* PlatformPasteboardIOS.mm in Sources */,

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r185179 r185223  
    6666#include "MediaQueryEvaluator.h"
    6767#include "MediaResourceLoader.h"
    68 #include "MediaSessionManager.h"
    6968#include "NetworkingContext.h"
    7069#include "PageGroup.h"
    7170#include "PageThrottler.h"
     71#include "PlatformMediaSessionManager.h"
    7272#include "ProgressTracker.h"
    7373#include "RenderLayerCompositor.h"

  • trunk/Source/WebCore/html/MediaElementSession.cpp

    r185120 r185223  
    3939#include "HTMLVideoElement.h"
    4040#include "Logging.h"
    41 #include "MediaSessionManager.h"
    4241#include "Page.h"
     42#include "PlatformMediaSessionManager.h"
    4343#include "ScriptController.h"
    4444#include "SourceBuffer.h"
    … …  
    204204#if PLATFORM(IOS)
    205205    // FIXME: consolidate Mac and iOS implementations
    206     m_hasPlaybackTargets = MediaSessionManager::sharedManager().hasWirelessTargetsAvailable();
     206    m_hasPlaybackTargets = PlatformMediaSessionManager::sharedManager().hasWirelessTargetsAvailable();
    207207#endif
    208208
    … …  
    269269    UNUSED_PARAM(element);
    270270    m_hasPlaybackTargetAvailabilityListeners = hasListeners;
    271     MediaSessionManager::sharedManager().configureWireLessTargetMonitoring();
     271    PlatformMediaSessionManager::sharedManager().configureWireLessTargetMonitoring();
    272272#else
    273273    UNUSED_PARAM(hasListeners);
    … …  
    329329MediaPlayer::Preload MediaElementSession::effectivePreloadForElement(const HTMLMediaElement& element) const
    330330{
    331     MediaSessionManager::SessionRestrictions restrictions = MediaSessionManager::sharedManager().restrictions(mediaType());
     331    PlatformMediaSessionManager::SessionRestrictions restrictions = PlatformMediaSessionManager::sharedManager().restrictions(mediaType());
    332332    MediaPlayer::Preload preload = element.preloadValue();
    333333
    334     if ((restrictions & MediaSessionManager::MetadataPreloadingNotPermitted) == MediaSessionManager::MetadataPreloadingNotPermitted)
     334    if ((restrictions & PlatformMediaSessionManager::MetadataPreloadingNotPermitted) == PlatformMediaSessionManager::MetadataPreloadingNotPermitted)
    335335        return MediaPlayer::None;
    336336
    337     if ((restrictions & MediaSessionManager::AutoPreloadingNotPermitted) == MediaSessionManager::AutoPreloadingNotPermitted) {
     337    if ((restrictions & PlatformMediaSessionManager::AutoPreloadingNotPermitted) == PlatformMediaSessionManager::AutoPreloadingNotPermitted) {
    338338        if (preload > MediaPlayer::MetaData)
    339339            return MediaPlayer::MetaData;
    … …  
    345345bool MediaElementSession::requiresFullscreenForVideoPlayback(const HTMLMediaElement& element) const
    346346{
    347     if (!MediaSessionManager::sharedManager().sessionRestrictsInlineVideoPlayback(*this))
     347    if (!PlatformMediaSessionManager::sharedManager().sessionRestrictsInlineVideoPlayback(*this))
    348348        return false;
    349349

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

    r185006 r185223  
    3131#include "Logging.h"
    3232#include "MediaPlayer.h"
    33 #include "MediaSessionManager.h"
     33#include "PlatformMediaSessionManager.h"
    3434
    3535namespace WebCore {
    … …  
    6666{
    6767    ASSERT(m_client.mediaType() >= None && m_client.mediaType() <= WebAudio);
    68     MediaSessionManager::sharedManager().addSession(*this);
     68    PlatformMediaSessionManager::sharedManager().addSession(*this);
    6969}
    7070
    7171PlatformMediaSession::~PlatformMediaSession()
    7272{
    73     MediaSessionManager::sharedManager().removeSession(*this);
     73    PlatformMediaSessionManager::sharedManager().removeSession(*this);
    7474}
    7575
    … …  
    119119        return true;
    120120
    121     if (!MediaSessionManager::sharedManager().sessionWillBeginPlayback(*this)) {
     121    if (!PlatformMediaSessionManager::sharedManager().sessionWillBeginPlayback(*this)) {
    122122        if (state() == Interrupted)
    123123            m_stateToRestore = Playing;
    … …  
    143143   
    144144    setState(Paused);
    145     MediaSessionManager::sharedManager().sessionWillEndPlayback(*this);
     145    PlatformMediaSessionManager::sharedManager().sessionWillEndPlayback(*this);
    146146    if (!m_clientDataBufferingTimer.isActive())
    147147        m_clientDataBufferingTimer.startOneShot(kClientDataBufferingTimerThrottleDelay);
    … …  
    205205        return;
    206206
    207     MediaSessionManager::SessionRestrictions restrictions = MediaSessionManager::sharedManager().restrictions(mediaType());
    208     if ((restrictions & MediaSessionManager::BackgroundTabPlaybackRestricted) == MediaSessionManager::BackgroundTabPlaybackRestricted)
     207    PlatformMediaSessionManager::SessionRestrictions restrictions = PlatformMediaSessionManager::sharedManager().restrictions(mediaType());
     208    if ((restrictions & PlatformMediaSessionManager::BackgroundTabPlaybackRestricted) == PlatformMediaSessionManager::BackgroundTabPlaybackRestricted)
    209209        pauseSession();
    210210}
    … …  
    215215        m_clientDataBufferingTimer.stop();
    216216
    217     m_client.setShouldBufferData(MediaSessionManager::sharedManager().sessionCanLoadMedia(*this));
     217    m_client.setShouldBufferData(PlatformMediaSessionManager::sharedManager().sessionCanLoadMedia(*this));
    218218}
    219219

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

    r185221 r185223  
    2525
    2626#include "config.h"
    27 #include "MediaSessionManager.h"
     27#include "PlatformMediaSessionManager.h"
    2828
    2929#if ENABLE(VIDEO)
    … …  
    3737
    3838#if !PLATFORM(IOS)
    39 MediaSessionManager& MediaSessionManager::sharedManager()
    40 {
    41     DEPRECATED_DEFINE_STATIC_LOCAL(MediaSessionManager, manager, ());
     39PlatformMediaSessionManager& PlatformMediaSessionManager::sharedManager()
     40{
     41    DEPRECATED_DEFINE_STATIC_LOCAL(PlatformMediaSessionManager, manager, ());
    4242    return manager;
    4343}
    4444#endif
    4545
    46 MediaSessionManager::MediaSessionManager()
     46PlatformMediaSessionManager::PlatformMediaSessionManager()
    4747    : m_systemSleepListener(SystemSleepListener::create(*this))
    4848{
    … …  
    5050}
    5151
    52 void MediaSessionManager::resetRestrictions()
     52void PlatformMediaSessionManager::resetRestrictions()
    5353{
    5454    m_restrictions[PlatformMediaSession::Video] = NoRestrictions;
    … …  
    5757}
    5858
    59 bool MediaSessionManager::has(PlatformMediaSession::MediaType type) const
     59bool PlatformMediaSessionManager::has(PlatformMediaSession::MediaType type) const
    6060{
    6161    ASSERT(type >= PlatformMediaSession::None && type <= PlatformMediaSession::WebAudio);
    … …  
    6969}
    7070
    71 bool MediaSessionManager::activeAudioSessionRequired() const
     71bool PlatformMediaSessionManager::activeAudioSessionRequired() const
    7272{
    7373    for (auto* session : m_sessions) {
    … …  
    7979}
    8080
    81 int MediaSessionManager::count(PlatformMediaSession::MediaType type) const
     81int PlatformMediaSessionManager::count(PlatformMediaSession::MediaType type) const
    8282{
    8383    ASSERT(type >= PlatformMediaSession::None && type <= PlatformMediaSession::WebAudio);
    … …  
    9292}
    9393
    94 void MediaSessionManager::beginInterruption(PlatformMediaSession::InterruptionType type)
    95 {
    96     LOG(Media, "MediaSessionManager::beginInterruption");
     94void PlatformMediaSessionManager::beginInterruption(PlatformMediaSession::InterruptionType type)
     95{
     96    LOG(Media, "PlatformMediaSessionManager::beginInterruption");
    9797
    9898    m_interrupted = true;
    … …  
    103103}
    104104
    105 void MediaSessionManager::endInterruption(PlatformMediaSession::EndInterruptionFlags flags)
    106 {
    107     LOG(Media, "MediaSessionManager::endInterruption");
     105void PlatformMediaSessionManager::endInterruption(PlatformMediaSession::EndInterruptionFlags flags)
     106{
     107    LOG(Media, "PlatformMediaSessionManager::endInterruption");
    108108
    109109    m_interrupted = false;
    … …  
    113113}
    114114
    115 void MediaSessionManager::addSession(PlatformMediaSession& session)
    116 {
    117     LOG(Media, "MediaSessionManager::addSession - %p", &session);
     115void PlatformMediaSessionManager::addSession(PlatformMediaSession& session)
     116{
     117    LOG(Media, "PlatformMediaSessionManager::addSession - %p", &session);
    118118   
    119119    m_sessions.append(&session);
    … …  
    130130}
    131131
    132 void MediaSessionManager::removeSession(PlatformMediaSession& session)
    133 {
    134     LOG(Media, "MediaSessionManager::removeSession - %p", &session);
     132void PlatformMediaSessionManager::removeSession(PlatformMediaSession& session)
     133{
     134    LOG(Media, "PlatformMediaSessionManager::removeSession - %p", &session);
    135135   
    136136    size_t index = m_sessions.find(&session);
    … …  
    149149}
    150150
    151 void MediaSessionManager::addRestriction(PlatformMediaSession::MediaType type, SessionRestrictions restriction)
     151void PlatformMediaSessionManager::addRestriction(PlatformMediaSession::MediaType type, SessionRestrictions restriction)
    152152{
    153153    ASSERT(type > PlatformMediaSession::None && type <= PlatformMediaSession::WebAudio);
    … …  
    155155}
    156156
    157 void MediaSessionManager::removeRestriction(PlatformMediaSession::MediaType type, SessionRestrictions restriction)
     157void PlatformMediaSessionManager::removeRestriction(PlatformMediaSession::MediaType type, SessionRestrictions restriction)
    158158{
    159159    ASSERT(type > PlatformMediaSession::None && type <= PlatformMediaSession::WebAudio);
    … …  
    161161}
    162162
    163 MediaSessionManager::SessionRestrictions MediaSessionManager::restrictions(PlatformMediaSession::MediaType type)
     163PlatformMediaSessionManager::SessionRestrictions PlatformMediaSessionManager::restrictions(PlatformMediaSession::MediaType type)
    164164{
    165165    ASSERT(type > PlatformMediaSession::None && type <= PlatformMediaSession::WebAudio);
    … …  
    167167}
    168168
    169 bool MediaSessionManager::sessionWillBeginPlayback(PlatformMediaSession& session)
    170 {
    171     LOG(Media, "MediaSessionManager::sessionWillBeginPlayback - %p", &session);
     169bool PlatformMediaSessionManager::sessionWillBeginPlayback(PlatformMediaSession& session)
     170{
     171    LOG(Media, "PlatformMediaSessionManager::sessionWillBeginPlayback - %p", &session);
    172172   
    173173    setCurrentSession(session);
    … …  
    198198}
    199199   
    200 void MediaSessionManager::sessionWillEndPlayback(PlatformMediaSession& session)
    201 {
    202     LOG(Media, "MediaSessionManager::sessionWillEndPlayback - %p", &session);
     200void PlatformMediaSessionManager::sessionWillEndPlayback(PlatformMediaSession& session)
     201{
     202    LOG(Media, "PlatformMediaSessionManager::sessionWillEndPlayback - %p", &session);
    203203   
    204204    if (m_sessions.size() < 2)
    … …  
    230230    m_sessions.insert(lastPlayingSessionIndex, &session);
    231231   
    232     LOG(Media, "MediaSessionManager::sessionWillEndPlayback - session moved from index %zu to %zu", pausingSessionIndex, lastPlayingSessionIndex);
    233 }
    234 
    235 void MediaSessionManager::setCurrentSession(PlatformMediaSession& session)
    236 {
    237     LOG(Media, "MediaSessionManager::setCurrentSession - %p", &session);
     232    LOG(Media, "PlatformMediaSessionManager::sessionWillEndPlayback - session moved from index %zu to %zu", pausingSessionIndex, lastPlayingSessionIndex);
     233}
     234
     235void PlatformMediaSessionManager::setCurrentSession(PlatformMediaSession& session)
     236{
     237    LOG(Media, "PlatformMediaSessionManager::setCurrentSession - %p", &session);
    238238   
    239239    if (m_sessions.size() < 2)
    … …  
    248248    m_sessions.insert(0, &session);
    249249   
    250     LOG(Media, "MediaSessionManager::setCurrentSession - session moved from index %zu to 0", index);
    251 }
    252    
    253 PlatformMediaSession* MediaSessionManager::currentSession()
     250    LOG(Media, "PlatformMediaSessionManager::setCurrentSession - session moved from index %zu to 0", index);
     251}
     252   
     253PlatformMediaSession* PlatformMediaSessionManager::currentSession()
    254254{
    255255    if (!m_sessions.size())
    … …  
    259259}
    260260   
    261 bool MediaSessionManager::sessionRestrictsInlineVideoPlayback(const PlatformMediaSession& session) const
     261bool PlatformMediaSessionManager::sessionRestrictsInlineVideoPlayback(const PlatformMediaSession& session) const
    262262{
    263263    PlatformMediaSession::MediaType sessionType = session.presentationType();
    … …  
    268268}
    269269
    270 bool MediaSessionManager::sessionCanLoadMedia(const PlatformMediaSession& session) const
     270bool PlatformMediaSessionManager::sessionCanLoadMedia(const PlatformMediaSession& session) const
    271271{
    272272    return session.state() == PlatformMediaSession::Playing || !session.isHidden() || session.isPlayingToWirelessPlaybackTarget();
    273273}
    274274
    275 void MediaSessionManager::applicationWillEnterBackground() const
    276 {
    277     LOG(Media, "MediaSessionManager::applicationWillEnterBackground");
     275void PlatformMediaSessionManager::applicationWillEnterBackground() const
     276{
     277    LOG(Media, "PlatformMediaSessionManager::applicationWillEnterBackground");
    278278    Vector<PlatformMediaSession*> sessions = m_sessions;
    279279    for (auto* session : sessions) {
    … …  
    283283}
    284284
    285 void MediaSessionManager::applicationWillEnterForeground() const
    286 {
    287     LOG(Media, "MediaSessionManager::applicationWillEnterForeground");
     285void PlatformMediaSessionManager::applicationWillEnterForeground() const
     286{
     287    LOG(Media, "PlatformMediaSessionManager::applicationWillEnterForeground");
    288288    Vector<PlatformMediaSession*> sessions = m_sessions;
    289289    for (auto* session : sessions) {
    … …  
    294294
    295295#if !PLATFORM(COCOA)
    296 void MediaSessionManager::updateSessionState()
     296void PlatformMediaSessionManager::updateSessionState()
    297297{
    298298}
    299299#endif
    300300
    301 void MediaSessionManager::didReceiveRemoteControlCommand(PlatformMediaSession::RemoteControlCommandType command)
     301void PlatformMediaSessionManager::didReceiveRemoteControlCommand(PlatformMediaSession::RemoteControlCommandType command)
    302302{
    303303    PlatformMediaSession* activeSession = currentSession();
    … …  
    307307}
    308308
    309 void MediaSessionManager::systemWillSleep()
     309void PlatformMediaSessionManager::systemWillSleep()
    310310{
    311311    if (m_interrupted)
    … …  
    316316}
    317317
    318 void MediaSessionManager::systemDidWake()
     318void PlatformMediaSessionManager::systemDidWake()
    319319{
    320320    if (m_interrupted)
    … …  
    325325}
    326326
    327 void MediaSessionManager::audioOutputDeviceChanged()
     327void PlatformMediaSessionManager::audioOutputDeviceChanged()
    328328{
    329329    updateSessionState();

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

    r185221 r185223  
    2424 */
    2525
    26 #ifndef MediaSessionManager_h
    27 #define MediaSessionManager_h
     26#ifndef PlatformMediaSessionManager_h
     27#define PlatformMediaSessionManager_h
    2828
    2929#include "AudioHardwareListener.h"
    … …  
    4141class RemoteCommandListener;
    4242
    43 class MediaSessionManager : private RemoteCommandListenerClient, private SystemSleepListener::Client, private AudioHardwareListener::Client {
     43class PlatformMediaSessionManager : private RemoteCommandListenerClient, private SystemSleepListener::Client, private AudioHardwareListener::Client {
    4444    WTF_MAKE_FAST_ALLOCATED;
    4545public:
    46     WEBCORE_EXPORT static MediaSessionManager& sharedManager();
    47     virtual ~MediaSessionManager() { }
     46    WEBCORE_EXPORT static PlatformMediaSessionManager& sharedManager();
     47    virtual ~PlatformMediaSessionManager() { }
    4848
    4949    bool has(PlatformMediaSession::MediaType) const;
    … …  
    9191protected:
    9292    friend class PlatformMediaSession;
    93     explicit MediaSessionManager();
     93    explicit PlatformMediaSessionManager();
    9494
    9595    void addSession(PlatformMediaSession&);
    … …  
    131131}
    132132
    133 #endif // MediaSessionManager_h
     133#endif // PlatformMediaSessionManager_h

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

    r185006 r185223  
    2929#if PLATFORM(IOS)
    3030
    31 #include "MediaSessionManager.h"
     31#include "PlatformMediaSessionManager.h"
    3232#include <wtf/RetainPtr.h>
    3333
    … …  
    4242namespace WebCore {
    4343
    44 class MediaSessionManageriOS : public MediaSessionManager {
     44class MediaSessionManageriOS : public PlatformMediaSessionManager {
    4545public:
    4646    virtual ~MediaSessionManageriOS();
    … …  
    5050
    5151private:
    52     friend class MediaSessionManager;
     52    friend class PlatformMediaSessionManager;
    5353
    5454    MediaSessionManageriOS();

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

    r185006 r185223  
    111111namespace WebCore {
    112112
    113 MediaSessionManager& MediaSessionManager::sharedManager()
     113PlatformMediaSessionManager& PlatformMediaSessionManager::sharedManager()
    114114{
    115115    DEPRECATED_DEFINE_STATIC_LOCAL(MediaSessionManageriOS, manager, ());
    … …  
    118118
    119119MediaSessionManageriOS::MediaSessionManageriOS()
    120     :MediaSessionManager()
     120    : PlatformMediaSessionManager()
    121121    , m_objcObserver(adoptNS([[WebMediaSessionHelper alloc] initWithCallback:this]))
    122122{
    … …  
    135135    LOG(Media, "MediaSessionManageriOS::resetRestrictions");
    136136
    137     MediaSessionManager::resetRestrictions();
     137    PlatformMediaSessionManager::resetRestrictions();
    138138
    139139    static wkDeviceClass deviceClass = iosDeviceClass();
    … …  
    189189bool MediaSessionManageriOS::sessionWillBeginPlayback(PlatformMediaSession& session)
    190190{
    191     if (!MediaSessionManager::sessionWillBeginPlayback(session))
     191    if (!PlatformMediaSessionManager::sessionWillBeginPlayback(session))
    192192        return false;
    193193
    … …  
    198198void MediaSessionManageriOS::sessionWillEndPlayback(PlatformMediaSession& session)
    199199{
    200     MediaSessionManager::sessionWillEndPlayback(session);
     200    PlatformMediaSessionManager::sessionWillEndPlayback(session);
    201201    updateNowPlayingInfo();
    202202}

  • trunk/Source/WebCore/platform/audio/mac/AudioDestinationMac.cpp

    r182141 r185223  
    3939#include "FloatConversion.h"
    4040#include "Logging.h"
    41 #include "MediaSessionManager.h"
     41#include "PlatformMediaSessionManager.h"
    4242#include "VectorMath.h"
    4343#include <CoreAudio/AudioHardware.h>

  • trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp

    r185006 r185223  
    2525
    2626#include "config.h"
    27 #include "MediaSessionManager.h"
     27#include "PlatformMediaSessionManager.h"
    2828
    2929#if USE(AUDIO_SESSION)
    … …  
    3838static const size_t kLowPowerVideoBufferSize = 4096;
    3939
    40 void MediaSessionManager::updateSessionState()
     40void PlatformMediaSessionManager::updateSessionState()
    4141{
    42     LOG(Media, "MediaSessionManager::updateSessionState() - types: Video(%d), Audio(%d), WebAudio(%d)", count(PlatformMediaSession::Video), count(PlatformMediaSession::Audio), count(PlatformMediaSession::WebAudio));
     42    LOG(Media, "PlatformMediaSessionManager::updateSessionState() - types: Video(%d), Audio(%d), WebAudio(%d)", count(PlatformMediaSession::Video), count(PlatformMediaSession::Audio), count(PlatformMediaSession::WebAudio));
    4343
    4444    if (has(PlatformMediaSession::WebAudio))

  • trunk/Source/WebCore/testing/Internals.cpp

    r185058 r185223  
    8080#include "MallocStatistics.h"
    8181#include "MediaPlayer.h"
    82 #include "MediaSessionManager.h"
    8382#include "MemoryCache.h"
    8483#include "MemoryInfo.h"
    … …  
    8988#include "PageCache.h"
    9089#include "PageOverlay.h"
     90#include "PlatformMediaSessionManager.h"
    9191#include "PrintContext.h"
    9292#include "PseudoElement.h"
    … …  
    323323    ApplicationCacheStorage::singleton().setDefaultOriginQuota(ApplicationCacheStorage::noQuota());
    324324#if ENABLE(VIDEO)
    325     MediaSessionManager::sharedManager().resetRestrictions();
     325    PlatformMediaSessionManager::sharedManager().resetRestrictions();
    326326#endif
    327327#if HAVE(ACCESSIBILITY)
    … …  
    25922592void Internals::beginMediaSessionInterruption()
    25932593{
    2594     MediaSessionManager::sharedManager().beginInterruption(PlatformMediaSession::SystemInterruption);
     2594    PlatformMediaSessionManager::sharedManager().beginInterruption(PlatformMediaSession::SystemInterruption);
    25952595}
    25962596
    … …  
    26022602        flags = PlatformMediaSession::MayResumePlaying;
    26032603   
    2604     MediaSessionManager::sharedManager().endInterruption(flags);
     2604    PlatformMediaSessionManager::sharedManager().endInterruption(flags);
    26052605}
    26062606
    26072607void Internals::applicationWillEnterForeground() const
    26082608{
    2609     MediaSessionManager::sharedManager().applicationWillEnterForeground();
     2609    PlatformMediaSessionManager::sharedManager().applicationWillEnterForeground();
    26102610}
    26112611
    26122612void Internals::applicationWillEnterBackground() const
    26132613{
    2614     MediaSessionManager::sharedManager().applicationWillEnterBackground();
     2614    PlatformMediaSessionManager::sharedManager().applicationWillEnterBackground();
    26152615}
    26162616
    … …  
    26292629    }
    26302630
    2631     MediaSessionManager::SessionRestrictions restrictions = MediaSessionManager::sharedManager().restrictions(mediaType);
    2632     MediaSessionManager::sharedManager().removeRestriction(mediaType, restrictions);
    2633 
    2634     restrictions = MediaSessionManager::NoRestrictions;
     2631    PlatformMediaSessionManager::SessionRestrictions restrictions = PlatformMediaSessionManager::sharedManager().restrictions(mediaType);
     2632    PlatformMediaSessionManager::sharedManager().removeRestriction(mediaType, restrictions);
     2633
     2634    restrictions = PlatformMediaSessionManager::NoRestrictions;
    26352635
    26362636    Vector<String> restrictionsArray;
    … …  
    26382638    for (auto& restrictionString : restrictionsArray) {
    26392639        if (equalIgnoringCase(restrictionString, "ConcurrentPlaybackNotPermitted"))
    2640             restrictions |= MediaSessionManager::ConcurrentPlaybackNotPermitted;
     2640            restrictions |= PlatformMediaSessionManager::ConcurrentPlaybackNotPermitted;
    26412641        if (equalIgnoringCase(restrictionString, "InlineVideoPlaybackRestricted"))
    2642             restrictions |= MediaSessionManager::InlineVideoPlaybackRestricted;
     2642            restrictions |= PlatformMediaSessionManager::InlineVideoPlaybackRestricted;
    26432643        if (equalIgnoringCase(restrictionString, "MetadataPreloadingNotPermitted"))
    2644             restrictions |= MediaSessionManager::MetadataPreloadingNotPermitted;
     2644            restrictions |= PlatformMediaSessionManager::MetadataPreloadingNotPermitted;
    26452645        if (equalIgnoringCase(restrictionString, "AutoPreloadingNotPermitted"))
    2646             restrictions |= MediaSessionManager::AutoPreloadingNotPermitted;
     2646            restrictions |= PlatformMediaSessionManager::AutoPreloadingNotPermitted;
    26472647        if (equalIgnoringCase(restrictionString, "BackgroundProcessPlaybackRestricted"))
    2648             restrictions |= MediaSessionManager::BackgroundProcessPlaybackRestricted;
     2648            restrictions |= PlatformMediaSessionManager::BackgroundProcessPlaybackRestricted;
    26492649        if (equalIgnoringCase(restrictionString, "BackgroundTabPlaybackRestricted"))
    2650             restrictions |= MediaSessionManager::BackgroundTabPlaybackRestricted;
     2650            restrictions |= PlatformMediaSessionManager::BackgroundTabPlaybackRestricted;
    26512651        if (equalIgnoringCase(restrictionString, "InterruptedPlaybackNotPermitted"))
    2652             restrictions |= MediaSessionManager::InterruptedPlaybackNotPermitted;
    2653     }
    2654     MediaSessionManager::sharedManager().addRestriction(mediaType, restrictions);
     2652            restrictions |= PlatformMediaSessionManager::InterruptedPlaybackNotPermitted;
     2653    }
     2654    PlatformMediaSessionManager::sharedManager().addRestriction(mediaType, restrictions);
    26552655}
    26562656
    … …  
    27192719    }
    27202720   
    2721     MediaSessionManager::sharedManager().didReceiveRemoteControlCommand(command);
     2721    PlatformMediaSessionManager::sharedManager().didReceiveRemoteControlCommand(command);
    27222722}
    27232723
    … …  
    27602760{
    27612761#if ENABLE(VIDEO)
    2762     MediaSessionManager::sharedManager().systemWillSleep();
     2762    PlatformMediaSessionManager::sharedManager().systemWillSleep();
    27632763#endif
    27642764}
    … …  
    27672767{
    27682768#if ENABLE(VIDEO)
    2769     MediaSessionManager::sharedManager().systemDidWake();
     2769    PlatformMediaSessionManager::sharedManager().systemDidWake();
    27702770#endif
    27712771}
Note: See TracChangeset for help on using the changeset viewer.