WebKit Bugzilla
Attachment 341974 Details for
Bug 186309
: [Cocoa] Improve some soft linking compatibility with ARC
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-186309-20180605102256.patch (text/plain), 32.88 KB, created by
Darin Adler
on 2018-06-05 10:22:57 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Darin Adler
Created:
2018-06-05 10:22:57 PDT
Size:
32.88 KB
patch
obsolete
>Subversion Revision: 232510 >diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog >index c937292673d9bccac08854a8ef784765bcee59d7..9802eb033ceef74ff848952591193c70b2982656 100644 >--- a/Source/WTF/ChangeLog >+++ b/Source/WTF/ChangeLog >@@ -1,3 +1,15 @@ >+2018-06-05 Darin Adler <darin@apple.com> >+ >+ [Cocoa] Improve some soft linking compatibility with ARC >+ https://bugs.webkit.org/show_bug.cgi?id=186309 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * wtf/cocoa/SoftLinking.h: Updated the SOFT_LINK_CONSTANT family of >+ macros to use a const type. This increases the chance that they will >+ work without triggering ARC compilation errors since it's easier to >+ get the type right for read-only access than for read/write. >+ > 2018-06-04 Darin Adler <darin@apple.com> > > [Cocoa] Improve smart pointer support for ARC (OSObjectPtr/DispatchPtr) >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 2df7ea18e66e1d86651731746cdf46ffde2ff516..502cf37ab4a9fd64295aaf72136a0163f553d658 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,29 @@ >+2018-06-05 Darin Adler <darin@apple.com> >+ >+ [Cocoa] Improve some soft linking compatibility with ARC >+ https://bugs.webkit.org/show_bug.cgi?id=186309 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * platform/audio/ios/AudioSessionIOS.mm: Use SOFT_LINK_CONSTANT instead of SOFT_LINK_POINTER >+ for NSString constants. >+ * platform/audio/ios/MediaSessionManagerIOS.mm: Ditto. >+ * platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm: Ditto. >+ * platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm: Ditto. >+ * platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm: Ditto. >+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm: Ditto. >+ (WebCore::MediaPlayerPrivateAVFoundationObjC::synchronizeTextTrackState): Use __bridge for >+ some bridging casts. >+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL): Ditto. >+ (WebCore::MediaPlayerPrivateAVFoundationObjC::updateLastImage): Ditto. >+ (WebCore::MediaPlayerPrivateAVFoundationObjC::processCue): Ditto. >+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm: Use >+ SOFT_LINK_CONSTANT instead of SOFT_LINK_POINTER for NSString constants. >+ * platform/mediastream/ios/CoreAudioCaptureSourceIOS.mm: Ditto. >+ * platform/mediastream/mac/AVCaptureDeviceManager.mm: Ditto. >+ * platform/mediastream/mac/AVMediaCaptureSource.mm: Ditto. >+ * platform/mediastream/mac/AVVideoCaptureSource.mm: Ditto. >+ > 2018-06-03 Darin Adler <darin@apple.com> > > Simplify and remove some unused video element code (helpful for ARC-compatibility) >diff --git a/Source/WTF/wtf/cocoa/SoftLinking.h b/Source/WTF/wtf/cocoa/SoftLinking.h >index 7a6cdcf4f12fa8d9434c281d7fb10a74c58ef903..0bccf68518a326f2dbab3a8d582559b55e753c9e 100644 >--- a/Source/WTF/wtf/cocoa/SoftLinking.h >+++ b/Source/WTF/wtf/cocoa/SoftLinking.h >@@ -270,7 +270,7 @@ > { \ > void* constant = dlsym(framework##Library(), #name); \ > RELEASE_ASSERT_WITH_MESSAGE(constant, "%s", dlerror()); \ >- constant##name = *static_cast<type*>(constant); \ >+ constant##name = *static_cast<type const *>(constant); \ > get##name = name##Function; \ > return constant##name; \ > } >@@ -297,7 +297,7 @@ > void* constant = dlsym(framework##Library(), #name); \ > if (!constant) \ > return false; \ >- constant##name = *static_cast<type*>(constant); \ >+ constant##name = *static_cast<type const *>(constant); \ > get##name = name##Function; \ > return true; \ > } >@@ -429,7 +429,7 @@ > dispatch_once(&once, ^{ \ > void* constant = dlsym(framework##Library(), #variableName); \ > RELEASE_ASSERT_WITH_MESSAGE(constant, "%s", dlerror()); \ >- constant##framework##variableName = *static_cast<variableType*>(constant); \ >+ constant##framework##variableName = *static_cast<variableType const *>(constant); \ > }); \ > return constant##framework##variableName; \ > } \ >@@ -457,7 +457,7 @@ > void* constant = dlsym(framework##Library(), #variableName); \ > if (!constant) \ > return false; \ >- constant##framework##variableName = *static_cast<variableType*>(constant); \ >+ constant##framework##variableName = *static_cast<variableType const *>(constant); \ > return true; \ > } \ > bool canLoad_##framework##_##variableName(); \ >diff --git a/Source/WebCore/platform/audio/ios/AudioSessionIOS.mm b/Source/WebCore/platform/audio/ios/AudioSessionIOS.mm >index 2f8f72d49cec40e89ef6f8e97625638141d78760..d5541df45b4177065213d98f2176f25370acb708 100644 >--- a/Source/WebCore/platform/audio/ios/AudioSessionIOS.mm >+++ b/Source/WebCore/platform/audio/ios/AudioSessionIOS.mm >@@ -38,14 +38,14 @@ > SOFT_LINK_FRAMEWORK(AVFoundation) > SOFT_LINK_CLASS(AVFoundation, AVAudioSession) > >-SOFT_LINK_POINTER(AVFoundation, AVAudioSessionCategoryAmbient, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVAudioSessionCategorySoloAmbient, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVAudioSessionCategoryPlayback, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVAudioSessionCategoryRecord, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVAudioSessionCategoryPlayAndRecord, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVAudioSessionCategoryAudioProcessing, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVAudioSessionModeDefault, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVAudioSessionModeVideoChat, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVAudioSessionCategoryAmbient, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVAudioSessionCategorySoloAmbient, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVAudioSessionCategoryPlayback, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVAudioSessionCategoryRecord, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVAudioSessionCategoryPlayAndRecord, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVAudioSessionCategoryAudioProcessing, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVAudioSessionModeDefault, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVAudioSessionModeVideoChat, NSString *) > > #define AVAudioSession getAVAudioSessionClass() > #define AVAudioSessionCategoryAmbient getAVAudioSessionCategoryAmbient() >diff --git a/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm b/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm >index 86cf9d9866609c14564a417581b261a457365c72..ca634b7dfe2091435713a38098f724b7960d84f5 100644 >--- a/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm >+++ b/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm >@@ -51,10 +51,10 @@ > > SOFT_LINK_FRAMEWORK(AVFoundation) > SOFT_LINK_CLASS(AVFoundation, AVAudioSession) >-SOFT_LINK_POINTER(AVFoundation, AVAudioSessionInterruptionNotification, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVAudioSessionInterruptionTypeKey, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVAudioSessionInterruptionOptionKey, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVRouteDetectorMultipleRoutesDetectedDidChangeNotification, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVAudioSessionInterruptionNotification, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVAudioSessionInterruptionTypeKey, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVAudioSessionInterruptionOptionKey, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVRouteDetectorMultipleRoutesDetectedDidChangeNotification, NSString *) > > #if HAVE(MEDIA_PLAYER) && !PLATFORM(WATCHOS) > SOFT_LINK_CLASS(AVFoundation, AVRouteDetector) >@@ -67,10 +67,10 @@ SOFT_LINK_CLASS(AVFoundation, AVRouteDetector) > > SOFT_LINK_FRAMEWORK(UIKit) > SOFT_LINK_CLASS(UIKit, UIApplication) >-SOFT_LINK_POINTER(UIKit, UIApplicationWillResignActiveNotification, NSString *) >-SOFT_LINK_POINTER(UIKit, UIApplicationWillEnterForegroundNotification, NSString *) >-SOFT_LINK_POINTER(UIKit, UIApplicationDidBecomeActiveNotification, NSString *) >-SOFT_LINK_POINTER(UIKit, UIApplicationDidEnterBackgroundNotification, NSString *) >+SOFT_LINK_CONSTANT(UIKit, UIApplicationWillResignActiveNotification, NSString *) >+SOFT_LINK_CONSTANT(UIKit, UIApplicationWillEnterForegroundNotification, NSString *) >+SOFT_LINK_CONSTANT(UIKit, UIApplicationDidBecomeActiveNotification, NSString *) >+SOFT_LINK_CONSTANT(UIKit, UIApplicationDidEnterBackgroundNotification, NSString *) > > #define UIApplication getUIApplicationClass() > #define UIApplicationWillResignActiveNotification getUIApplicationWillResignActiveNotification() >@@ -81,11 +81,11 @@ SOFT_LINK_POINTER(UIKit, UIApplicationDidEnterBackgroundNotification, NSString * > #if HAVE(MEDIA_PLAYER) > SOFT_LINK_FRAMEWORK(MediaPlayer) > SOFT_LINK_CLASS(MediaPlayer, MPNowPlayingInfoCenter) >-SOFT_LINK_POINTER(MediaPlayer, MPMediaItemPropertyTitle, NSString *) >-SOFT_LINK_POINTER(MediaPlayer, MPMediaItemPropertyPlaybackDuration, NSString *) >-SOFT_LINK_POINTER(MediaPlayer, MPNowPlayingInfoPropertyElapsedPlaybackTime, NSString *) >-SOFT_LINK_POINTER(MediaPlayer, MPNowPlayingInfoPropertyPlaybackRate, NSString *) >-SOFT_LINK_POINTER(MediaPlayer, kMRMediaRemoteNowPlayingInfoUniqueIdentifier, NSString *) >+SOFT_LINK_CONSTANT(MediaPlayer, MPMediaItemPropertyTitle, NSString *) >+SOFT_LINK_CONSTANT(MediaPlayer, MPMediaItemPropertyPlaybackDuration, NSString *) >+SOFT_LINK_CONSTANT(MediaPlayer, MPNowPlayingInfoPropertyElapsedPlaybackTime, NSString *) >+SOFT_LINK_CONSTANT(MediaPlayer, MPNowPlayingInfoPropertyPlaybackRate, NSString *) >+SOFT_LINK_CONSTANT(MediaPlayer, kMRMediaRemoteNowPlayingInfoUniqueIdentifier, NSString *) > > #define MPMediaItemPropertyTitle getMPMediaItemPropertyTitle() > #define MPMediaItemPropertyPlaybackDuration getMPMediaItemPropertyPlaybackDuration() >diff --git a/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm >index 5f5da3d6611c0eb3145d0b3bc2353c1d5b75b71a..605d87337f70ae2ffc219d30654e8b231fa55518 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm >+++ b/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm >@@ -64,9 +64,6 @@ SOFT_LINK(MediaToolbox, MTAudioProcessingTapGetStorage, void*, (MTAudioProcessin > SOFT_LINK(MediaToolbox, MTAudioProcessingTapGetSourceAudio, OSStatus, (MTAudioProcessingTapRef tap, CMItemCount numberFrames, AudioBufferList *bufferListInOut, MTAudioProcessingTapFlags *flagsOut, CMTimeRange *timeRangeOut, CMItemCount *numberFramesOut), (tap, numberFrames, bufferListInOut, flagsOut, timeRangeOut, numberFramesOut)) > SOFT_LINK_MAY_FAIL(MediaToolbox, MTAudioProcessingTapCreate, OSStatus, (CFAllocatorRef allocator, const MTAudioProcessingTapCallbacks *callbacks, MTAudioProcessingTapCreationFlags flags, MTAudioProcessingTapRef *tapOut), (allocator, callbacks, flags, tapOut)) > >-SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicAudible, NSString *) >-#define AVMediaCharacteristicAudible getAVMediaCharacteristicAudible() >- > namespace WebCore { > > using namespace PAL; >diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm >index a4ec36aa10fdfcae199ce1a2a53f0d3114990d61..d88f7c7479b2b4be07890f9096f7d94a0f7124a3 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm >+++ b/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm >@@ -54,16 +54,16 @@ SOFT_LINK_CLASS(AVFoundation, AVPlayerItemLegibleOutput) > #define AVMediaCharacteristicIsMainProgramContent getAVMediaCharacteristicIsMainProgramContent() > #define AVMediaCharacteristicEasyToRead getAVMediaCharacteristicEasyToRead() > >-SOFT_LINK_POINTER(AVFoundation, AVMediaTypeClosedCaption, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicLegible, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMetadataCommonKeyTitle, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMetadataKeySpaceCommon, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMediaTypeSubtitle, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicTranscribesSpokenDialogForAccessibility, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicDescribesMusicAndSoundForAccessibility, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicContainsOnlyForcedSubtitles, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicIsMainProgramContent, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicEasyToRead, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeClosedCaption, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaCharacteristicLegible, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMetadataCommonKeyTitle, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMetadataKeySpaceCommon, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeSubtitle, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaCharacteristicTranscribesSpokenDialogForAccessibility, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaCharacteristicDescribesMusicAndSoundForAccessibility, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaCharacteristicContainsOnlyForcedSubtitles, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaCharacteristicIsMainProgramContent, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaCharacteristicEasyToRead, NSString *) > > #define AVPlayer getAVPlayerClass() > #define AVPlayerItem getAVPlayerItemClass() >diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm >index 30e38fa7facb5f46e41116d54ad9894f20016d77..9987fdd1cd5d437b12a74309cbc51f9510ab3d23 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm >+++ b/Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm >@@ -41,10 +41,10 @@ SOFT_LINK_CLASS(AVFoundation, AVPlayerItem) > SOFT_LINK_CLASS(AVFoundation, AVMetadataItem) > #define AVMediaTypeClosedCaption getAVMediaTypeClosedCaption() > >-SOFT_LINK_POINTER(AVFoundation, AVMediaTypeClosedCaption, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicLegible, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMetadataCommonKeyTitle, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMetadataKeySpaceCommon, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeClosedCaption, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaCharacteristicLegible, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMetadataCommonKeyTitle, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMetadataKeySpaceCommon, NSString *) > > #define AVPlayerItem getAVPlayerItemClass() > #define AVMetadataItem getAVMetadataItemClass() >diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm >index a4e6a22b5d179fba87859f1e859caf697a35abb0..37fb71f75b13df38728e26f4b9ab692c1a1af960 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm >+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm >@@ -165,21 +165,21 @@ SOFT_LINK_CLASS_FOR_SOURCE(WebCore, AVFoundation, AVAssetCache) > SOFT_LINK_CLASS(CoreImage, CIContext) > SOFT_LINK_CLASS(CoreImage, CIImage) > >-SOFT_LINK_POINTER(AVFoundation, AVAudioTimePitchAlgorithmSpectral, NSString*) >-SOFT_LINK_POINTER(AVFoundation, AVAudioTimePitchAlgorithmVarispeed, NSString*) >-SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicVisual, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicAudible, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMediaTypeClosedCaption, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMediaTypeVideo, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMediaTypeAudio, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMediaTypeMetadata, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVPlayerItemDidPlayToEndTimeNotification, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVURLAssetInheritURIQueryComponentFromReferencingURIKey, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVAssetImageGeneratorApertureModeCleanAperture, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVURLAssetReferenceRestrictionsKey, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVLayerVideoGravityResizeAspect, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVLayerVideoGravityResizeAspectFill, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVLayerVideoGravityResize, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVAudioTimePitchAlgorithmSpectral, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVAudioTimePitchAlgorithmVarispeed, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaCharacteristicVisual, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaCharacteristicAudible, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeClosedCaption, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeVideo, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeAudio, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeMetadata, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVPlayerItemDidPlayToEndTimeNotification, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVURLAssetInheritURIQueryComponentFromReferencingURIKey, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVAssetImageGeneratorApertureModeCleanAperture, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVURLAssetReferenceRestrictionsKey, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVLayerVideoGravityResizeAspect, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVLayerVideoGravityResizeAspectFill, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVLayerVideoGravityResize, NSString *) > > SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVURLAssetClientBundleIdentifierKey, NSString *) > SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVURLAssetRequiresCustomURLLoadingKey, NSString *) >@@ -224,10 +224,10 @@ SOFT_LINK_CLASS(AVFoundation, AVMediaSelectionGroup) > SOFT_LINK_CLASS(AVFoundation, AVMediaSelectionOption) > SOFT_LINK_CLASS(AVFoundation, AVOutputContext) > >-SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicLegible, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMediaTypeSubtitle, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicContainsOnlyForcedSubtitles, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVPlayerItemLegibleOutputTextStylingResolutionSourceAndRulesOnly, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaCharacteristicLegible, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeSubtitle, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaCharacteristicContainsOnlyForcedSubtitles, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVPlayerItemLegibleOutputTextStylingResolutionSourceAndRulesOnly, NSString *) > > #define AVPlayerItemLegibleOutput getAVPlayerItemLegibleOutputClass() > #define AVMediaSelectionGroup getAVMediaSelectionGroupClass() >@@ -239,18 +239,18 @@ SOFT_LINK_POINTER(AVFoundation, AVPlayerItemLegibleOutputTextStylingResolutionSo > #endif > > #if ENABLE(AVF_CAPTIONS) >-SOFT_LINK_POINTER(AVFoundation, AVURLAssetCacheKey, NSString*) >-SOFT_LINK_POINTER(AVFoundation, AVURLAssetOutOfBandAlternateTracksKey, NSString*) >-SOFT_LINK_POINTER(AVFoundation, AVURLAssetUsesNoPersistentCacheKey, NSString*) >-SOFT_LINK_POINTER(AVFoundation, AVOutOfBandAlternateTrackDisplayNameKey, NSString*) >-SOFT_LINK_POINTER(AVFoundation, AVOutOfBandAlternateTrackExtendedLanguageTagKey, NSString*) >-SOFT_LINK_POINTER(AVFoundation, AVOutOfBandAlternateTrackIsDefaultKey, NSString*) >-SOFT_LINK_POINTER(AVFoundation, AVOutOfBandAlternateTrackMediaCharactersticsKey, NSString*) >-SOFT_LINK_POINTER(AVFoundation, AVOutOfBandAlternateTrackIdentifierKey, NSString*) >-SOFT_LINK_POINTER(AVFoundation, AVOutOfBandAlternateTrackSourceKey, NSString*) >-SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicDescribesMusicAndSoundForAccessibility, NSString*) >-SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicTranscribesSpokenDialogForAccessibility, NSString*) >-SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicIsAuxiliaryContent, NSString*) >+SOFT_LINK_CONSTANT(AVFoundation, AVURLAssetCacheKey, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVURLAssetOutOfBandAlternateTracksKey, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVURLAssetUsesNoPersistentCacheKey, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVOutOfBandAlternateTrackDisplayNameKey, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVOutOfBandAlternateTrackExtendedLanguageTagKey, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVOutOfBandAlternateTrackIsDefaultKey, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVOutOfBandAlternateTrackMediaCharactersticsKey, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVOutOfBandAlternateTrackIdentifierKey, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVOutOfBandAlternateTrackSourceKey, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaCharacteristicDescribesMusicAndSoundForAccessibility, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaCharacteristicTranscribesSpokenDialogForAccessibility, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaCharacteristicIsAuxiliaryContent, NSString *) > SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVURLAssetHTTPCookiesKey, NSString*) > > #define AVURLAssetHTTPCookiesKey getAVURLAssetHTTPCookiesKey() >@@ -269,11 +269,11 @@ SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVURLAssetHTTPCookiesKey, NSString*) > #endif > > #if ENABLE(DATACUE_VALUE) >-SOFT_LINK_POINTER(AVFoundation, AVMetadataKeySpaceQuickTimeUserData, NSString*) >+SOFT_LINK_CONSTANT(AVFoundation, AVMetadataKeySpaceQuickTimeUserData, NSString *) > SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVMetadataKeySpaceISOUserData, NSString*) >-SOFT_LINK_POINTER(AVFoundation, AVMetadataKeySpaceQuickTimeMetadata, NSString*) >-SOFT_LINK_POINTER(AVFoundation, AVMetadataKeySpaceiTunes, NSString*) >-SOFT_LINK_POINTER(AVFoundation, AVMetadataKeySpaceID3, NSString*) >+SOFT_LINK_CONSTANT(AVFoundation, AVMetadataKeySpaceQuickTimeMetadata, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMetadataKeySpaceiTunes, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMetadataKeySpaceID3, NSString *) > > #define AVMetadataKeySpaceQuickTimeUserData getAVMetadataKeySpaceQuickTimeUserData() > #define AVMetadataKeySpaceISOUserData getAVMetadataKeySpaceISOUserData() >@@ -283,7 +283,7 @@ SOFT_LINK_POINTER(AVFoundation, AVMetadataKeySpaceID3, NSString*) > #endif > > #if PLATFORM(IOS) >-SOFT_LINK_POINTER(AVFoundation, AVURLAssetBoundNetworkInterfaceName, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVURLAssetBoundNetworkInterfaceName, NSString *) > #define AVURLAssetBoundNetworkInterfaceName getAVURLAssetBoundNetworkInterfaceName() > #endif > >@@ -293,9 +293,9 @@ SOFT_LINK_OPTIONAL(MediaToolbox, MTEnableCaption2015Behavior, Boolean, (), ()) > #if PLATFORM(IOS) > #if HAVE(CELESTIAL) > SOFT_LINK_PRIVATE_FRAMEWORK(Celestial) >-SOFT_LINK_POINTER(Celestial, AVController_RouteDescriptionKey_RouteCurrentlyPicked, NSString *) >-SOFT_LINK_POINTER(Celestial, AVController_RouteDescriptionKey_RouteName, NSString *) >-SOFT_LINK_POINTER(Celestial, AVController_RouteDescriptionKey_AVAudioRouteName, NSString *) >+SOFT_LINK_CONSTANT(Celestial, AVController_RouteDescriptionKey_RouteCurrentlyPicked, NSString *) >+SOFT_LINK_CONSTANT(Celestial, AVController_RouteDescriptionKey_RouteName, NSString *) >+SOFT_LINK_CONSTANT(Celestial, AVController_RouteDescriptionKey_AVAudioRouteName, NSString *) > #define AVController_RouteDescriptionKey_RouteCurrentlyPicked getAVController_RouteDescriptionKey_RouteCurrentlyPicked() > #define AVController_RouteDescriptionKey_RouteName getAVController_RouteDescriptionKey_RouteName() > #define AVController_RouteDescriptionKey_AVAudioRouteName getAVController_RouteDescriptionKey_AVAudioRouteName() >@@ -794,7 +794,7 @@ void MediaPlayerPrivateAVFoundationObjC::synchronizeTextTrackState() > for (auto& track : outOfBandTrackSources) { > RetainPtr<CFStringRef> uniqueID = String::number(track->uniqueId()).createCFString(); > >- if (![[currentOption.get() outOfBandIdentifier] isEqual: reinterpret_cast<const NSString*>(uniqueID.get())]) >+ if (![[currentOption.get() outOfBandIdentifier] isEqual:(__bridge NSString *)uniqueID.get()]) > continue; > > InbandTextTrackPrivate::Mode mode = InbandTextTrackPrivate::Hidden; >@@ -910,11 +910,11 @@ void MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL(const URL& url) > RetainPtr<CFStringRef> uniqueID = String::number(trackSource->uniqueId()).createCFString(); > RetainPtr<CFStringRef> url = trackSource->url().createCFString(); > [outOfBandTracks.get() addObject:@{ >- AVOutOfBandAlternateTrackDisplayNameKey: reinterpret_cast<const NSString*>(label.get()), >- AVOutOfBandAlternateTrackExtendedLanguageTagKey: reinterpret_cast<const NSString*>(language.get()), >+ AVOutOfBandAlternateTrackDisplayNameKey: (__bridge NSString *)label.get(), >+ AVOutOfBandAlternateTrackExtendedLanguageTagKey: (__bridge NSString *)language.get(), > AVOutOfBandAlternateTrackIsDefaultKey: trackSource->isDefault() ? @YES : @NO, >- AVOutOfBandAlternateTrackIdentifierKey: reinterpret_cast<const NSString*>(uniqueID.get()), >- AVOutOfBandAlternateTrackSourceKey: reinterpret_cast<const NSString*>(url.get()), >+ AVOutOfBandAlternateTrackIdentifierKey: (__bridge NSString *)uniqueID.get(), >+ AVOutOfBandAlternateTrackSourceKey: (__bridge NSString *)url.get(), > AVOutOfBandAlternateTrackMediaCharactersticsKey: mediaDescriptionForKind(trackSource->kind()), > }]; > } >@@ -2289,11 +2289,11 @@ void MediaPlayerPrivateAVFoundationObjC::updateLastImage(UpdateType type) > > if (!m_pixelBufferConformer) { > #if USE(VIDEOTOOLBOX) >- NSDictionary *attributes = @{ (NSString *)kCVPixelBufferPixelFormatTypeKey: @(kCVPixelFormatType_32BGRA) }; >+ NSDictionary *attributes = @{ (__bridge NSString *)kCVPixelBufferPixelFormatTypeKey: @(kCVPixelFormatType_32BGRA) }; > #else > NSDictionary *attributes = nil; > #endif >- m_pixelBufferConformer = std::make_unique<PixelBufferConformerCV>((CFDictionaryRef)attributes); >+ m_pixelBufferConformer = std::make_unique<PixelBufferConformerCV>((__bridge CFDictionaryRef)attributes); > } > > #if !RELEASE_LOG_DISABLED >@@ -2639,7 +2639,7 @@ void MediaPlayerPrivateAVFoundationObjC::processCue(NSArray *attributedStrings, > if (!m_currentTextTrack) > return; > >- m_currentTextTrack->processCue(reinterpret_cast<CFArrayRef>(attributedStrings), reinterpret_cast<CFArrayRef>(nativeSamples), time); >+ m_currentTextTrack->processCue((__bridge CFArrayRef)attributedStrings), (__bridge CFArrayRef)nativeSamples, time); > } > > void MediaPlayerPrivateAVFoundationObjC::flushCues() >diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm >index 7f7d03fcad9b05ccbb973359949783851d571225..a97c938b2a27c49d41a4fa9d2715d27af5d34287 100644 >--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm >+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm >@@ -56,9 +56,9 @@ SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation) > > SOFT_LINK_CLASS_OPTIONAL(AVFoundation, AVSampleBufferDisplayLayer) > >-SOFT_LINK_POINTER(AVFoundation, AVLayerVideoGravityResizeAspect, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVLayerVideoGravityResizeAspectFill, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVLayerVideoGravityResize, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVLayerVideoGravityResizeAspect, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVLayerVideoGravityResizeAspectFill, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVLayerVideoGravityResize, NSString *) > > #define AVLayerVideoGravityResizeAspect getAVLayerVideoGravityResizeAspect() > #define AVLayerVideoGravityResizeAspectFill getAVLayerVideoGravityResizeAspectFill() >diff --git a/Source/WebCore/platform/mediastream/ios/CoreAudioCaptureSourceIOS.mm b/Source/WebCore/platform/mediastream/ios/CoreAudioCaptureSourceIOS.mm >index 6c4fbe58d82b9a8b3d7e4136e3b42d3f36fa73fb..00663a5de917ca114b8403fb23d89f4daa0c05da 100644 >--- a/Source/WebCore/platform/mediastream/ios/CoreAudioCaptureSourceIOS.mm >+++ b/Source/WebCore/platform/mediastream/ios/CoreAudioCaptureSourceIOS.mm >@@ -38,9 +38,9 @@ typedef AVAudioSession AVAudioSessionType; > SOFT_LINK_FRAMEWORK(AVFoundation) > SOFT_LINK_CLASS(AVFoundation, AVAudioSession) > >-SOFT_LINK_POINTER(AVFoundation, AVAudioSessionInterruptionNotification, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVAudioSessionInterruptionTypeKey, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVAudioSessionMediaServicesWereResetNotification, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVAudioSessionInterruptionNotification, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVAudioSessionInterruptionTypeKey, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVAudioSessionMediaServicesWereResetNotification, NSString *) > > #define AVAudioSession getAVAudioSessionClass() > #define AVAudioSessionInterruptionNotification getAVAudioSessionInterruptionNotification() >diff --git a/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm b/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm >index a571016933fc625ddf96c024b98cf77adf47f92b..c011b26e686b05c1fa0b69a0d91d7cf0ca63f340 100644 >--- a/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm >+++ b/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm >@@ -52,15 +52,15 @@ SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation) > SOFT_LINK_CLASS(AVFoundation, AVCaptureDevice) > SOFT_LINK_CLASS(AVFoundation, AVCaptureSession) > >-SOFT_LINK_POINTER(AVFoundation, AVMediaTypeAudio, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMediaTypeMuxed, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMediaTypeVideo, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVCaptureSessionPreset1280x720, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVCaptureSessionPreset640x480, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVCaptureSessionPreset352x288, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVCaptureSessionPresetLow, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVCaptureDeviceWasConnectedNotification, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVCaptureDeviceWasDisconnectedNotification, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeAudio, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeMuxed, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeVideo, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVCaptureSessionPreset1280x720, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVCaptureSessionPreset640x480, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVCaptureSessionPreset352x288, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVCaptureSessionPresetLow, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVCaptureDeviceWasConnectedNotification, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVCaptureDeviceWasDisconnectedNotification, NSString *) > > #define AVMediaTypeAudio getAVMediaTypeAudio() > #define AVMediaTypeMuxed getAVMediaTypeMuxed() >diff --git a/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm b/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm >index afec3968a9f49e53f2fb25936585dc44161f1a12..9824aa754b2139b545e787c3b5211bc3e0382b28 100644 >--- a/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm >+++ b/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm >@@ -69,9 +69,9 @@ SOFT_LINK_CLASS(AVFoundation, AVCaptureVideoDataOutput) > #define AVCaptureSession getAVCaptureSessionClass() > #define AVCaptureVideoDataOutput getAVCaptureVideoDataOutputClass() > >-SOFT_LINK_POINTER(AVFoundation, AVMediaTypeAudio, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMediaTypeMuxed, NSString *) >-SOFT_LINK_POINTER(AVFoundation, AVMediaTypeVideo, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeAudio, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeMuxed, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeVideo, NSString *) > > #define AVMediaTypeAudio getAVMediaTypeAudio() > #define AVMediaTypeMuxed getAVMediaTypeMuxed() >diff --git a/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm b/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm >index 9e37fb90af4fe8f9d3199114697ba8d920bccb59..fb64c763722b052da715a8d9422e692fa7fbcdc0 100644 >--- a/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm >+++ b/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm >@@ -85,7 +85,7 @@ SOFT_LINK_CLASS(AVFoundation, AVFrameRateRange) > #define AVCaptureVideoPreviewLayer getAVCaptureVideoPreviewLayerClass() > #define AVFrameRateRange getAVFrameRateRangeClass() > >-SOFT_LINK_POINTER(AVFoundation, AVMediaTypeVideo, NSString *) >+SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeVideo, NSString *) > SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVCaptureSessionPreset1280x720, NSString *) > SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVCaptureSessionPreset960x540, NSString *) > SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVCaptureSessionPreset640x480, NSString *)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
andersca
:
review+
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 186309
: 341974