Changeset 202642 in webkit


Ignore:
Timestamp:
Jun 29, 2016 12:29:07 PM (8 years ago)
Author:
jer.noble@apple.com
Message:

Adopt MediaRemote.
​https://bugs.webkit.org/show_bug.cgi?id=159250

Reviewed by Eric Carlson.

Source/WebCore:

Adopt MediaRemote and use the framework to implement MediaSessionManageMac
and RemoteCommandListenerMac.

  • WebCore.xcodeproj/project.pbxproj:
  • platform/RemoteCommandListener.cpp:
  • platform/audio/PlatformMediaSessionManager.cpp:
  • platform/audio/cocoa/MediaSessionManagerCocoa.cpp: Renamed from Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp.

(PlatformMediaSessionManager::updateSessionState):

  • platform/audio/mac/MediaSessionManagerMac.h: Added.
  • platform/audio/mac/MediaSessionManagerMac.mm: Added.

(WebCore::PlatformMediaSessionManager::sharedManager):
(WebCore::PlatformMediaSessionManager::sharedManagerIfExists):
(WebCore::MediaSessionManagerMac::MediaSessionManagerMac):
(WebCore::MediaSessionManagerMac::~MediaSessionManagerMac):
(WebCore::MediaSessionManagerMac::sessionWillBeginPlayback):
(WebCore::MediaSessionManagerMac::removeSession):
(WebCore::MediaSessionManagerMac::sessionWillEndPlayback):
(WebCore::MediaSessionManagerMac::clientCharacteristicsChanged):
(WebCore::MediaSessionManagerMac::nowPlayingEligibleSession):
(WebCore::MediaSessionManagerMac::updateNowPlayingInfo):

  • platform/cocoa/SoftLinking.h:
  • platform/mac/MediaRemoteSoftLink.cpp: Added.
  • platform/mac/MediaRemoteSoftLink.h: Added.
  • platform/mac/RemoteCommandListenerMac.h: Added.

(WebCore::RemoteCommandListenerMac::createWeakPtr):

  • platform/mac/RemoteCommandListenerMac.mm: Added.

(WebCore::RemoteCommandListener::create):
(WebCore::RemoteCommandListenerMac::RemoteCommandListenerMac):
(WebCore::RemoteCommandListenerMac::~RemoteCommandListenerMac):

  • platform/spi/mac/MediaRemoteSPI.h: Added.

Source/WebKit2:

Add a sandbox exception allowing access to the mediaremoted XPC service.

  • WebProcess/com.apple.WebProcess.sb.in:

Source/WTF:

Add USE_MEDIAREMOTE.

  • wtf/Platform.h:
Location:
trunk/Source
Files:
8 added
9 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r202611 r202642  
     12016-06-29  Jer Noble  <jer.noble@apple.com>
     2
     3        Adopt MediaRemote.
     4        https://bugs.webkit.org/show_bug.cgi?id=159250
     5
     6        Reviewed by Eric Carlson.
     7
     8        Add USE_MEDIAREMOTE.
     9
     10        * wtf/Platform.h:
     11
    1122016-06-28  Commit Queue  <commit-queue@webkit.org>
    213

  • trunk/Source/WTF/wtf/Platform.h

    r202560 r202642  
    12131213#endif
    12141214
     1215#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
     1216#define USE_MEDIAREMOTE 1
     1217#endif
     1218
    12151219#endif /* WTF_Platform_h */

  • trunk/Source/WebCore/ChangeLog

    r202641 r202642  
     12016-06-29  Jer Noble  <jer.noble@apple.com>
     2
     3        Adopt MediaRemote.
     4        https://bugs.webkit.org/show_bug.cgi?id=159250
     5
     6        Reviewed by Eric Carlson.
     7
     8        Adopt MediaRemote and use the framework to implement MediaSessionManageMac
     9        and RemoteCommandListenerMac.
     10
     11        * WebCore.xcodeproj/project.pbxproj:
     12        * platform/RemoteCommandListener.cpp:
     13        * platform/audio/PlatformMediaSessionManager.cpp:
     14        * platform/audio/cocoa/MediaSessionManagerCocoa.cpp: Renamed from Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp.
     15        (PlatformMediaSessionManager::updateSessionState):
     16        * platform/audio/mac/MediaSessionManagerMac.h: Added.
     17        * platform/audio/mac/MediaSessionManagerMac.mm: Added.
     18        (WebCore::PlatformMediaSessionManager::sharedManager):
     19        (WebCore::PlatformMediaSessionManager::sharedManagerIfExists):
     20        (WebCore::MediaSessionManagerMac::MediaSessionManagerMac):
     21        (WebCore::MediaSessionManagerMac::~MediaSessionManagerMac):
     22        (WebCore::MediaSessionManagerMac::sessionWillBeginPlayback):
     23        (WebCore::MediaSessionManagerMac::removeSession):
     24        (WebCore::MediaSessionManagerMac::sessionWillEndPlayback):
     25        (WebCore::MediaSessionManagerMac::clientCharacteristicsChanged):
     26        (WebCore::MediaSessionManagerMac::nowPlayingEligibleSession):
     27        (WebCore::MediaSessionManagerMac::updateNowPlayingInfo):
     28        * platform/cocoa/SoftLinking.h:
     29        * platform/mac/MediaRemoteSoftLink.cpp: Added.
     30        * platform/mac/MediaRemoteSoftLink.h: Added.
     31        * platform/mac/RemoteCommandListenerMac.h: Added.
     32        (WebCore::RemoteCommandListenerMac::createWeakPtr):
     33        * platform/mac/RemoteCommandListenerMac.mm: Added.
     34        (WebCore::RemoteCommandListener::create):
     35        (WebCore::RemoteCommandListenerMac::RemoteCommandListenerMac):
     36        (WebCore::RemoteCommandListenerMac::~RemoteCommandListenerMac):
     37        * platform/spi/mac/MediaRemoteSPI.h: Added.
     38
    1392016-06-29  Jer Noble  <jer.noble@apple.com>
    240

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

    r202599 r202642  
    320320                07E9E12E18F5E2760011A3A4 /* InbandMetadataTextTrackPrivateAVF.h in Headers */ = {isa = PBXBuildFile; fileRef = 07E9E12D18F5E2760011A3A4 /* InbandMetadataTextTrackPrivateAVF.h */; };
    321321                07E9E13018F62B370011A3A4 /* InbandMetadataTextTrackPrivateAVF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07E9E12F18F62B370011A3A4 /* InbandMetadataTextTrackPrivateAVF.cpp */; };
    322                 07EDC3EE1AACB75D00983EB5 /* MediaSessionManagerMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07EDC3ED1AACB75D00983EB5 /* MediaSessionManagerMac.cpp */; };
     322                07EDC3EE1AACB75D00983EB5 /* MediaSessionManagerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 07EDC3ED1AACB75D00983EB5 /* MediaSessionManagerMac.mm */; };
    323323                07EE76EB1BE96DB000F89133 /* MockRealtimeVideoSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07EE76E91BE96DB000F89133 /* MockRealtimeVideoSource.cpp */; };
    324324                07EE76EC1BE96DB000F89133 /* MockRealtimeVideoSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 07EE76EA1BE96DB000F89133 /* MockRealtimeVideoSource.h */; };
    … …  
    61286128                CD641EBF1819B36000EE4C41 /* MediaTimeAVFoundation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD641EBD1819B35900EE4C41 /* MediaTimeAVFoundation.cpp */; };
    61296129                CD641EC01819B36000EE4C41 /* MediaTimeAVFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = CD641EBE1819B35900EE4C41 /* MediaTimeAVFoundation.h */; };
     6130                CD669D681D23364B004D1866 /* MediaSessionManagerCocoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD669D661D232DFF004D1866 /* MediaSessionManagerCocoa.cpp */; };
    61306131                CD7D33431C7A123F00041293 /* PixelBufferConformerCV.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD7D33411C7A123F00041293 /* PixelBufferConformerCV.cpp */; };
    61316132                CD7D33441C7A123F00041293 /* PixelBufferConformerCV.h in Headers */ = {isa = PBXBuildFile; fileRef = CD7D33421C7A123F00041293 /* PixelBufferConformerCV.h */; };
    … …  
    61436144                CD8A7BBB197735FE00CBD643 /* AudioSourceProviderAVFObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD8A7BB9197735FE00CBD643 /* AudioSourceProviderAVFObjC.mm */; };
    61446145                CD8A7BBC197735FE00CBD643 /* AudioSourceProviderAVFObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = CD8A7BBA197735FE00CBD643 /* AudioSourceProviderAVFObjC.h */; };
     6146                CD8ACA881D237AA200ECC59E /* RemoteCommandListenerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD8ACA861D237AA200ECC59E /* RemoteCommandListenerMac.mm */; };
     6147                CD8ACA891D237AA200ECC59E /* RemoteCommandListenerMac.h in Headers */ = {isa = PBXBuildFile; fileRef = CD8ACA871D237AA200ECC59E /* RemoteCommandListenerMac.h */; };
     6148                CD8ACA8B1D23946400ECC59E /* MediaRemoteSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CD8ACA8A1D23946400ECC59E /* MediaRemoteSPI.h */; };
     6149                CD8ACA8E1D23971900ECC59E /* MediaRemoteSoftLink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD8ACA8C1D23971900ECC59E /* MediaRemoteSoftLink.cpp */; };
     6150                CD8ACA8F1D23971900ECC59E /* MediaRemoteSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = CD8ACA8D1D23971900ECC59E /* MediaRemoteSoftLink.h */; };
    61456151                CD8B5A42180D149A008B8E65 /* VideoTrackPrivateMediaSourceAVFObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD8B5A40180D149A008B8E65 /* VideoTrackPrivateMediaSourceAVFObjC.mm */; };
    61466152                CD8B5A43180D149A008B8E65 /* VideoTrackPrivateMediaSourceAVFObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = CD8B5A41180D149A008B8E65 /* VideoTrackPrivateMediaSourceAVFObjC.h */; };
    … …  
    77877793                07E9E12D18F5E2760011A3A4 /* InbandMetadataTextTrackPrivateAVF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InbandMetadataTextTrackPrivateAVF.h; sourceTree = "<group>"; };
    77887794                07E9E12F18F62B370011A3A4 /* InbandMetadataTextTrackPrivateAVF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InbandMetadataTextTrackPrivateAVF.cpp; sourceTree = "<group>"; };
    7789                 07EDC3ED1AACB75D00983EB5 /* MediaSessionManagerMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaSessionManagerMac.cpp; sourceTree = "<group>"; };
     7795                07EDC3ED1AACB75D00983EB5 /* MediaSessionManagerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaSessionManagerMac.mm; sourceTree = "<group>"; };
    77907796                07EE76E91BE96DB000F89133 /* MockRealtimeVideoSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MockRealtimeVideoSource.cpp; sourceTree = "<group>"; };
    77917797                07EE76EA1BE96DB000F89133 /* MockRealtimeVideoSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MockRealtimeVideoSource.h; sourceTree = "<group>"; };
    … …  
    1418614192                CD641EBE1819B35900EE4C41 /* MediaTimeAVFoundation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaTimeAVFoundation.h; sourceTree = "<group>"; };
    1418714193                CD641EC7181ED60100EE4C41 /* MediaSample.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaSample.h; sourceTree = "<group>"; };
     14194                CD669D661D232DFF004D1866 /* MediaSessionManagerCocoa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MediaSessionManagerCocoa.cpp; path = cocoa/MediaSessionManagerCocoa.cpp; sourceTree = "<group>"; };
     14195                CD669D671D232E10004D1866 /* MediaSessionManagerMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaSessionManagerMac.h; sourceTree = "<group>"; };
    1418814196                CD7D33411C7A123F00041293 /* PixelBufferConformerCV.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PixelBufferConformerCV.cpp; path = ../cv/PixelBufferConformerCV.cpp; sourceTree = "<group>"; };
    1418914197                CD7D33421C7A123F00041293 /* PixelBufferConformerCV.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PixelBufferConformerCV.h; path = ../cv/PixelBufferConformerCV.h; sourceTree = "<group>"; };
    … …  
    1420214210                CD8A7BB9197735FE00CBD643 /* AudioSourceProviderAVFObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AudioSourceProviderAVFObjC.mm; sourceTree = "<group>"; };
    1420314211                CD8A7BBA197735FE00CBD643 /* AudioSourceProviderAVFObjC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioSourceProviderAVFObjC.h; sourceTree = "<group>"; };
     14212                CD8ACA861D237AA200ECC59E /* RemoteCommandListenerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteCommandListenerMac.mm; sourceTree = "<group>"; };
     14213                CD8ACA871D237AA200ECC59E /* RemoteCommandListenerMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteCommandListenerMac.h; sourceTree = "<group>"; };
     14214                CD8ACA8A1D23946400ECC59E /* MediaRemoteSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaRemoteSPI.h; sourceTree = "<group>"; };
     14215                CD8ACA8C1D23971900ECC59E /* MediaRemoteSoftLink.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaRemoteSoftLink.cpp; sourceTree = "<group>"; };
     14216                CD8ACA8D1D23971900ECC59E /* MediaRemoteSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaRemoteSoftLink.h; sourceTree = "<group>"; };
    1420414217                CD8B5A40180D149A008B8E65 /* VideoTrackPrivateMediaSourceAVFObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = VideoTrackPrivateMediaSourceAVFObjC.mm; sourceTree = "<group>"; };
    1420514218                CD8B5A41180D149A008B8E65 /* VideoTrackPrivateMediaSourceAVFObjC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoTrackPrivateMediaSourceAVFObjC.h; sourceTree = "<group>"; };
    … …  
    1807318086                                06E81EEB0AB5DA9700C87837 /* LocalCurrentGraphicsContext.mm */,
    1807418087                                1402645D0AFDC19B005919E2 /* LoggingMac.mm */,
     18088                                CD8ACA8C1D23971900ECC59E /* MediaRemoteSoftLink.cpp */,
     18089                                CD8ACA8D1D23971900ECC59E /* MediaRemoteSoftLink.h */,
    1807518090                                93500F3113FDE3BE0099EC24 /* NSScrollerImpDetails.h */,
    1807618091                                52F52E1014A0134F00ACC397 /* NSScrollerImpDetails.mm */,
    … …  
    1808818103                                46DBB64E1AB8C96F00D9A813 /* PowerObserverMac.h */,
    1808918104                                0081FEFE16B0A2B6008AAA7A /* PublicSuffixMac.mm */,
     18105                                CD8ACA861D237AA200ECC59E /* RemoteCommandListenerMac.mm */,
     18106                                CD8ACA871D237AA200ECC59E /* RemoteCommandListenerMac.h */,
    1809018107                                BCAE1FA512939DB7004CB026 /* ScrollAnimatorMac.h */,
    1809118108                                BC51156D12B1749C00C96754 /* ScrollAnimatorMac.mm */,
    … …  
    1923219249                                2D59F1BE1A0044C6001F3D29 /* DataDetectorsSPI.h */,
    1923319250                                2D413F601A187A3F0041A521 /* LookupSPI.h */,
     19251                                CD8ACA8A1D23946400ECC59E /* MediaRemoteSPI.h */,
    1923419252                                2D77AC261BF2B9860072470A /* NSAccessibilitySPI.h */,
    1923519253                                2D77AC271BF2B9860072470A /* NSApplicationSPI.h */,
    … …  
    2334323361                        sourceTree = "<group>";
    2334423362                };
     23363                CD669D651D232DF4004D1866 /* cocoa */ = {
     23364                        isa = PBXGroup;
     23365                        children = (
     23366                                CD669D661D232DFF004D1866 /* MediaSessionManagerCocoa.cpp */,
     23367                        );
     23368                        name = cocoa;
     23369                        sourceTree = "<group>";
     23370                };
    2334523371                CD9A37F517C7D93600C5FA7A /* mediacontrols */ = {
    2334623372                        isa = PBXGroup;
    … …  
    2504325069                        isa = PBXGroup;
    2504425070                        children = (
     25071                                CD669D651D232DF4004D1866 /* cocoa */,
    2504525072                                CD0EEE0D14743E48003EAFA2 /* ios */,
    2504625073                                FD3160B012B0270700C1A359 /* mac */,
    … …  
    2514525172                                CDC734131977896C0046BFC5 /* CARingBuffer.h */,
    2514625173                                FD3160BA12B0272A00C1A359 /* FFTFrameMac.cpp */,
    25147                                 07EDC3ED1AACB75D00983EB5 /* MediaSessionManagerMac.cpp */,
     25174                                07EDC3ED1AACB75D00983EB5 /* MediaSessionManagerMac.mm */,
     25175                                CD669D671D232E10004D1866 /* MediaSessionManagerMac.h */,
    2514825176                        );
    2514925177                        path = mac;
    … …  
    2646126489                                A8DF3FD0097FA0FC0052981B /* HTMLCollection.h in Headers */,
    2646226490                                977B3865122883E900B81FF8 /* HTMLConstructionSite.h in Headers */,
     26491                                CD8ACA8F1D23971900ECC59E /* MediaRemoteSoftLink.h in Headers */,
    2646326492                                7C3E510A18DF8F3500C112F7 /* HTMLConverter.h in Headers */,
    2646426493                                83120C711C56F3FB001CB112 /* HTMLDataElement.h in Headers */,
    … …  
    2707927108                                CD9DE17B17AAC75B00EA386D /* JSSourceBuffer.h in Headers */,
    2708027109                                CD9DE17D17AAC75B00EA386D /* JSSourceBufferList.h in Headers */,
     27110                                CD8ACA8B1D23946400ECC59E /* MediaRemoteSPI.h in Headers */,
    2708127111                                076306E117E16089005A7C4E /* JSSourceInfo.h in Headers */,
    2708227112                                AA7FEEAD16A4E74B004C0C33 /* JSSpeechSynthesis.h in Headers */,
    … …  
    2880128831                                934D9BA70B8C1175007B42A9 /* WebCoreNSStringExtras.h in Headers */,
    2880228832                                C5B4C24D1509236C00A6EF37 /* WebCoreNSURLExtras.h in Headers */,
     28833                                CD8ACA891D237AA200ECC59E /* RemoteCommandListenerMac.h in Headers */,
    2880328834                                CD225C0C1C46FBF400140761 /* WebCoreNSURLSession.h in Headers */,
    2880428835                                DD05FE0D0B8BA3C6009ACDFE /* WebCoreObjCExtras.h in Headers */,
    … …  
    2965329684                                BC02A5400E099C5A004B6D2B /* CSSParserValues.cpp in Sources */,
    2965429685                                977B3862122883E900B81FF8 /* CSSPreloadScanner.cpp in Sources */,
     29686                                CD669D681D23364B004D1866 /* MediaSessionManagerCocoa.cpp in Sources */,
    2965529687                                A80E6D050A1989CA007FB8C5 /* CSSPrimitiveValue.cpp in Sources */,
    2965629688                                A80E6CF70A1989CA007FB8C5 /* CSSProperty.cpp in Sources */,
    … …  
    3128731319                                C90F65551B2253B1002163A1 /* MediaSessionManager.cpp in Sources */,
    3128831320                                07638A9A1884487200E15A1B /* MediaSessionManagerIOS.mm in Sources */,
    31289                                 07EDC3EE1AACB75D00983EB5 /* MediaSessionManagerMac.cpp in Sources */,
     31321                                07EDC3EE1AACB75D00983EB5 /* MediaSessionManagerMac.mm in Sources */,
    3129031322                                CD3A495E17A9D01B00274E42 /* MediaSource.cpp in Sources */,
    3129131323                                CDC8B5A6180474F70016E685 /* MediaSourcePrivateAVFObjC.mm in Sources */,
    … …  
    3139131423                                1A569D160D7E2B82007C3983 /* objc_instance.mm in Sources */,
    3139231424                                1A569D180D7E2B82007C3983 /* objc_runtime.mm in Sources */,
     31425                                CD8ACA881D237AA200ECC59E /* RemoteCommandListenerMac.mm in Sources */,
    3139331426                                1A569D1A0D7E2B82007C3983 /* objc_utility.mm in Sources */,
    3139431427                                1CF6BDFB0E9BB26A0025E1CD /* ObjCEventListener.mm in Sources */,
    … …  
    3220032233                                1F72BF0A187FD4490009BCB3 /* TileControllerMemoryHandlerIOS.cpp in Sources */,
    3220132234                                7AA3A6A3194B5C22001CBD24 /* TileCoverageMap.cpp in Sources */,
     32235                                CD8ACA8E1D23971900ECC59E /* MediaRemoteSoftLink.cpp in Sources */,
    3220232236                                7AA3A69B194A64E7001CBD24 /* TileGrid.cpp in Sources */,
    3220332237                                498770F21242C535002226BA /* TilingData.cpp in Sources */,

  • trunk/Source/WebCore/platform/RemoteCommandListener.cpp

    r167590 r202642  
    2929namespace WebCore {
    3030
    31 #if !PLATFORM(IOS)
     31#if !PLATFORM(IOS) && !PLATFORM(MAC)
    3232std::unique_ptr<RemoteCommandListener> RemoteCommandListener::create(RemoteCommandListenerClient& client)
    3333{

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

    r202425 r202642  
    3737namespace WebCore {
    3838
    39 #if !PLATFORM(IOS)
     39#if !PLATFORM(IOS) && !PLATFORM(MAC)
    4040static PlatformMediaSessionManager* platformMediaSessionManager = nullptr;
    4141

  • trunk/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.cpp

    r202641 r202642  
    6666        else
    6767            AudioSession::sharedSession().setCategory(AudioSession::AmbientSound);
    68     }
    69     else if (has(PlatformMediaSession::WebAudio))
     68    } else if (has(PlatformMediaSession::WebAudio))
    7069        AudioSession::sharedSession().setCategory(AudioSession::AmbientSound);
    7170#endif

  • trunk/Source/WebCore/platform/cocoa/SoftLinking.h

    r202122 r202642  
    326326    }
    327327
     328#define SOFT_LINK_PRIVATE_FRAMEWORK_FOR_SOURCE(functionNamespace, framework) \
     329    namespace functionNamespace { \
     330    void* framework##Library(bool isOptional = false); \
     331    void* framework##Library(bool isOptional) \
     332    { \
     333        static void* frameworkLibrary; \
     334        static dispatch_once_t once; \
     335        dispatch_once(&once, ^{ \
     336            frameworkLibrary = dlopen("/System/Library/PrivateFrameworks/" #framework ".framework/" #framework, RTLD_NOW); \
     337            if (!isOptional) \
     338                RELEASE_ASSERT_WITH_MESSAGE(frameworkLibrary, "%s", dlerror()); \
     339        }); \
     340        return frameworkLibrary; \
     341    } \
     342    }
     343
    328344#define SOFT_LINK_CLASS_FOR_HEADER(functionNamespace, framework, className) \
    329345    @class className; \

  • trunk/Source/WebKit2/ChangeLog

    r202640 r202642  
     12016-06-29  Jer Noble  <jer.noble@apple.com>
     2
     3        Adopt MediaRemote.
     4        https://bugs.webkit.org/show_bug.cgi?id=159250
     5
     6        Reviewed by Eric Carlson.
     7
     8        Add a sandbox exception allowing access to the mediaremoted XPC service.
     9
     10        * WebProcess/com.apple.WebProcess.sb.in:
     11
    1122016-06-29  Alex Christensen  <achristensen@webkit.org>
    213

  • trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in

    r202389 r202642  
    201201       (global-name "com.apple.nesessionmanager.flow-divert-token")
    202202#endif
     203#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
     204       (global-name "com.apple.mediaremoted.xpc")
     205#endif
    203206)
    204207
Note: See TracChangeset for help on using the changeset viewer.