Changeset 261110 in webkit
- Timestamp:
- May 4, 2020 1:21:43 PM (4 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WTF/ChangeLog
r261098 r261110 1 2020-05-04 Darin Adler <darin@apple.com> 2 3 Remove unneeded USE(MEDIAREMOTE) 4 https://bugs.webkit.org/show_bug.cgi?id=211385 5 6 Reviewed by Eric Carlson. 7 8 * wtf/PlatformUse.h: Don't set USE_MEDIAREMOTE. 9 1 10 2020-05-04 Darin Adler <darin@apple.com> 2 11 -
trunk/Source/WTF/wtf/PlatformUse.h
r261097 r261110 271 271 272 272 #if PLATFORM(COCOA) 273 #define USE_MEDIAREMOTE 1274 273 #define USE_DICTATION_ALTERNATIVES 1 275 274 #endif -
trunk/Source/WebCore/ChangeLog
r261104 r261110 1 2020-05-04 Darin Adler <darin@apple.com> 2 3 Remove unneeded USE(MEDIAREMOTE) 4 https://bugs.webkit.org/show_bug.cgi?id=211385 5 6 Reviewed by Eric Carlson. 7 8 * platform/audio/cocoa/MediaSessionManagerCocoa.mm: 9 (WebCore::MediaSessionManagerCocoa::updateNowPlayingInfo): Remove USE(MEDIAREMOTE). 10 * platform/mac/MediaRemoteSoftLink.cpp: Ditto. 11 * platform/mac/MediaRemoteSoftLink.h: Ditto. 12 * platform/mac/RemoteCommandListenerMac.mm: 13 (WebCore::RemoteCommandListenerMac::updateSupportedCommands): Ditto. 14 (WebCore::RemoteCommandListenerMac::RemoteCommandListenerMac): Ditto. 15 (WebCore::RemoteCommandListenerMac::~RemoteCommandListenerMac): Ditto. 16 1 17 2020-05-04 Devin Rousso <drousso@apple.com> 2 18 -
trunk/Source/WebCore/PAL/ChangeLog
r261007 r261110 1 2020-05-04 Darin Adler <darin@apple.com> 2 3 Remove unneeded USE(MEDIAREMOTE) 4 https://bugs.webkit.org/show_bug.cgi?id=211385 5 6 Reviewed by Eric Carlson. 7 8 * pal/spi/mac/MediaRemoteSPI.h: Removed check of USE(MEDIAREMOTE). 9 Also got rid of __has_include for MRNowPlayingTypes.h and moved 10 it down into the normal sections below. 11 1 12 2020-05-01 Don Olmstead <don.olmstead@sony.com> 2 13 -
trunk/Source/WebCore/PAL/pal/spi/mac/MediaRemoteSPI.h
r235474 r261110 26 26 #pragma once 27 27 28 #if USE(MEDIAREMOTE) 29 30 #if __has_include(<MediaRemote/MRNowPlayingTypes.h>) 28 #if USE(APPLE_INTERNAL_SDK) 31 29 32 30 #include <MediaRemote/MRNowPlayingTypes.h> 33 34 #else35 36 enum {37 MRNowPlayingClientVisibilityUndefined = 0,38 MRNowPlayingClientVisibilityAlwaysVisible,39 MRNowPlayingClientVisibilityVisibleWhenBackgrounded,40 MRNowPlayingClientVisibilityNeverVisible41 };42 typedef uint32_t MRNowPlayingClientVisibility;43 44 #endif45 46 #if USE(APPLE_INTERNAL_SDK)47 48 31 #include <MediaRemote/MediaRemote.h> 49 32 … … 101 84 typedef uint32_t MRMediaRemoteCommandHandlerStatus; 102 85 86 enum { 87 MRNowPlayingClientVisibilityUndefined = 0, 88 MRNowPlayingClientVisibilityAlwaysVisible, 89 MRNowPlayingClientVisibilityVisibleWhenBackgrounded, 90 MRNowPlayingClientVisibilityNeverVisible 91 }; 92 typedef uint32_t MRNowPlayingClientVisibility; 93 103 94 typedef uint32_t MRMediaRemoteError; 104 95 typedef struct _MROrigin *MROriginRef; … … 140 131 141 132 #endif // USE(APPLE_INTERNAL_SDK) 142 143 #endif // USE(MEDIAREMOTE) -
trunk/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm
r261004 r261110 313 313 void MediaSessionManagerCocoa::updateNowPlayingInfo() 314 314 { 315 #if USE(MEDIAREMOTE)316 315 if (!isMediaRemoteFrameworkAvailable()) 317 316 return; … … 362 361 363 362 END_BLOCK_OBJC_EXCEPTIONS 364 #endif // USE(MEDIAREMOTE)365 363 } 366 364 -
trunk/Source/WebCore/platform/mac/MediaRemoteSoftLink.cpp
r237266 r261110 31 31 SOFT_LINK_PRIVATE_FRAMEWORK_FOR_SOURCE(WebCore, MediaRemote) 32 32 33 #if USE(MEDIAREMOTE)34 35 33 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, MediaRemote, MRMediaRemoteGetLocalOrigin, MROriginRef, (), ()) 36 34 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, MediaRemote, MRMediaRemoteAddAsyncCommandHandlerBlock, void*, (MRMediaRemoteAsyncCommandHandlerBlock block), (block)) … … 53 51 SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, MediaRemote, kMRMediaRemoteNowPlayingInfoUniqueIdentifier, CFStringRef); 54 52 55 #endif // USE(MEDIAREMOTE)56 57 53 #if PLATFORM(IOS_FAMILY) 58 54 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, MediaRemote, MRMediaRemoteCopyPickableRoutes, CFArrayRef, (), ()); -
trunk/Source/WebCore/platform/mac/MediaRemoteSoftLink.h
r237266 r261110 30 30 31 31 SOFT_LINK_FRAMEWORK_FOR_HEADER(WebCore, MediaRemote) 32 33 #if USE(MEDIAREMOTE)34 32 35 33 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, MediaRemote, MRMediaRemoteGetLocalOrigin, MROriginRef, (), ()) … … 72 70 #define kMRMediaRemoteNowPlayingInfoUniqueIdentifier get_MediaRemote_kMRMediaRemoteNowPlayingInfoUniqueIdentifier() 73 71 74 #endif // USE(MEDIAREMOTE)75 76 72 #if PLATFORM(IOS_FAMILY) 77 73 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, MediaRemote, MRMediaRemoteCopyPickableRoutes, CFArrayRef, (), ()) -
trunk/Source/WebCore/platform/mac/RemoteCommandListenerMac.mm
r260366 r261110 43 43 void RemoteCommandListenerMac::updateSupportedCommands() 44 44 { 45 #if USE(MEDIAREMOTE)46 45 if (!isMediaRemoteFrameworkAvailable()) 47 46 return; … … 73 72 74 73 MRMediaRemoteSetSupportedCommands(commandInfoArray.get(), MRMediaRemoteGetLocalOrigin(), nullptr, nullptr); 75 #endif // USE(MEDIAREMOTE)76 74 } 77 75 … … 79 77 : RemoteCommandListener(client) 80 78 { 81 #if USE(MEDIAREMOTE)82 79 if (!isMediaRemoteFrameworkAvailable()) 83 80 return; … … 145 142 completion((__bridge CFArrayRef)@[@(status)]); 146 143 }); 147 #endif // USE(MEDIAREMOTE)148 144 } 149 145 150 146 RemoteCommandListenerMac::~RemoteCommandListenerMac() 151 147 { 152 #if USE(MEDIAREMOTE)153 148 if (m_commandHandler) 154 149 MRMediaRemoteRemoveCommandHandlerBlock(m_commandHandler); 155 #endif156 150 } 157 151 -
trunk/Tools/ChangeLog
r261101 r261110 1 2020-05-04 Darin Adler <darin@apple.com> 2 3 Remove unneeded USE(MEDIAREMOTE) 4 https://bugs.webkit.org/show_bug.cgi?id=211385 5 6 Reviewed by Eric Carlson. 7 8 * TestWebKitAPI/Tests/WebKitCocoa/NowPlaying.mm: Reverse conditional so it's 9 consistently listing which platforms we do *not* compile the test on. 10 1 11 2020-05-04 Alex Christensen <achristensen@webkit.org> 2 12 -
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/NowPlaying.mm
r260366 r261110 26 26 #import "config.h" 27 27 28 #if USE(MEDIAREMOTE) && !PLATFORM(IOS_FAMILY_SIMULATOR) && (PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101304))28 #if !PLATFORM(IOS_FAMILY_SIMULATOR) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101304) 29 29 30 30 #import "PlatformUtilities.h" … … 277 277 } 278 278 279 #endif // USE(MEDIAREMOTE) && (PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101304))279 #endif
Note: See TracChangeset
for help on using the changeset viewer.