Modified: trunk/Source/WebCore/PAL/ChangeLog (267012 => 267013)
--- trunk/Source/WebCore/PAL/ChangeLog 2020-09-14 15:30:04 UTC (rev 267012)
+++ trunk/Source/WebCore/PAL/ChangeLog 2020-09-14 15:44:59 UTC (rev 267013)
@@ -1,3 +1,15 @@
+2020-09-14 Peng Liu <[email protected]>
+
+ Unreviewed, reverting r267004.
+
+ The patch leads to build failures on macOS Catalina.
+
+ Reverted changeset:
+
+ "Clean up AVKitSPI.h"
+ https://bugs.webkit.org/show_bug.cgi?id=216449
+ https://trac.webkit.org/changeset/267004
+
2020-09-13 Peng Liu <[email protected]>
Clean up AVKitSPI.h
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/AVFoundationSPI.h (267012 => 267013)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/AVFoundationSPI.h 2020-09-14 15:30:04 UTC (rev 267012)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/AVFoundationSPI.h 2020-09-14 15:44:59 UTC (rev 267013)
@@ -40,6 +40,10 @@
#import <AVFoundation/AVPlayerItem_Private.h>
#import <AVFoundation/AVPlayerLayer_Private.h>
+#if PLATFORM(IOS_FAMILY) && HAVE(AVKIT)
+#import <AVKit/AVPlayerViewController_WebKitOnly.h>
+#endif
+
#if ENABLE(MEDIA_SOURCE)
#import <AVFoundation/AVStreamDataParser.h>
#endif
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/AVKitSPI.h (267012 => 267013)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/AVKitSPI.h 2020-09-14 15:30:04 UTC (rev 267012)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/AVKitSPI.h 2020-09-14 15:44:59 UTC (rev 267013)
@@ -26,31 +26,75 @@
#import <objc/runtime.h>
#import <wtf/SoftLinking.h>
+#if USE(APPLE_INTERNAL_SDK)
+#import <AVKit/AVPlayerController.h>
+#else
#if PLATFORM(IOS_FAMILY)
-#import <AVKit/AVKit.h>
-#import <QuartzCore/QuartzCore.h>
+#import <UIKit/UIResponder.h>
+@interface AVPlayerController : UIResponder
+#else
+#import <AppKit/NSResponder.h>
+@interface AVPlayerController : NSResponder <NSUserInterfaceValidations>
#endif
+@end
+@interface AVPlayerController ()
+typedef NS_ENUM(NSInteger, AVPlayerControllerStatus) {
+ AVPlayerControllerStatusUnknown = 0,
+ AVPlayerControllerStatusReadyToPlay = 2,
+};
+typedef NS_ENUM(NSInteger, AVPlayerControllerExternalPlaybackType) {
+ AVPlayerControllerExternalPlaybackTypeNone = 0,
+ AVPlayerControllerExternalPlaybackTypeAirPlay = 1,
+ AVPlayerControllerExternalPlaybackTypeTVOut = 2,
+};
+
+@property (NS_NONATOMIC_IOSONLY, readonly) AVPlayerControllerStatus status;
+@end
+#endif // USE(APPLE_INTERNAL_SDK)
+
+#if HAVE(AVOBSERVATIONCONTROLLER)
#if USE(APPLE_INTERNAL_SDK)
+#import <AVKit/AVObservationController.h>
+#else
-#import <AVKit/AVValueTiming.h>
+@class AVKeyValueChange;
+NS_ASSUME_NONNULL_BEGIN
+
+@interface AVObservationController<Owner> : NSObject
+- (instancetype)initWithOwner:(Owner)owner NS_DESIGNATED_INITIALIZER;
+- (id)startObserving:(id)object keyPath:(NSString *)keyPath includeInitialValue:(BOOL)shouldIncludeInitialValue observationHandler:(void (^)(Owner owner, id observed, AVKeyValueChange *change))observationHandler;
+- (void)stopAllObservation;
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif
+#endif // HAVE(AVOBSERVATIONCONTROLLER)
+
#if PLATFORM(IOS_FAMILY)
-#import <AVKit/AVPlayerController.h>
+#import <AVKit/AVKit.h>
+#import <QuartzCore/QuartzCore.h>
+#import <UIKit/UIKit.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#if PLATFORM(IOS) || PLATFORM(MACCATALYST)
+#import <AVKit/AVBackgroundView.h>
+#endif
+
IGNORE_WARNINGS_BEGIN("objc-property-no-attribute")
#import <AVKit/AVPlayerLayerView.h>
IGNORE_WARNINGS_END
#import <AVKit/AVPlayerViewController_Private.h>
#import <AVKit/AVPlayerViewController_WebKitOnly.h>
-#endif
-#if PLATFORM(IOS) || PLATFORM(MACCATALYST)
-#import <AVKit/AVBackgroundView.h>
-#endif
+#if PLATFORM(WATCHOS)
-#if PLATFORM(WATCHOS)
#import <AVFoundation/AVPlayerLayer.h>
+
NS_ASSUME_NONNULL_BEGIN
@interface AVPictureInPicturePlayerLayerView : UIView
@@ -92,9 +136,8 @@
@end
NS_ASSUME_NONNULL_END
-#endif // PLATFORM(WATCHOS)
-#if PLATFORM(APPLETV)
+#elif PLATFORM(APPLETV)
NS_ASSUME_NONNULL_BEGIN
@interface AVPlayerViewController (AVPlayerViewController_WebKitOnly_OverrideRouteSharingPolicy)
- (void)setWebKitOverrideRouteSharingPolicy:(NSUInteger)routeSharingPolicy routingContextUID:(NSString *)routingContextUID;
@@ -102,58 +145,10 @@
NS_ASSUME_NONNULL_END
#endif
-#if PLATFORM(MAC)
-#import <AVKit/AVPlayerView_Private.h>
-#endif
-
#else
NS_ASSUME_NONNULL_BEGIN
-@interface AVValueTiming : NSObject <NSCoding, NSCopying, NSMutableCopying>
-@end
-
-@interface AVValueTiming ()
-+ (AVValueTiming *)valueTimingWithAnchorValue:(double)anchorValue anchorTimeStamp:(NSTimeInterval)timeStamp rate:(double)rate;
-@property (NS_NONATOMIC_IOSONLY, readonly) double currentValue;
-@property (NS_NONATOMIC_IOSONLY, readonly) double rate;
-@property (NS_NONATOMIC_IOSONLY, readonly) NSTimeInterval anchorTimeStamp;
-@property (NS_NONATOMIC_IOSONLY, readonly) double anchorValue;
-
-+ (NSTimeInterval)currentTimeStamp;
-- (double)valueForTimeStamp:(NSTimeInterval)timeStamp;
-@end
-
-NS_ASSUME_NONNULL_END
-
-#if PLATFORM(IOS_FAMILY)
-#import <UIKit/UIResponder.h>
-@interface AVPlayerController : UIResponder
-@end
-#else
-#import <AppKit/NSResponder.h>
-@interface AVPlayerController : NSResponder <NSUserInterfaceValidations>
-@end
-#endif
-
-@interface AVPlayerController ()
-typedef NS_ENUM(NSInteger, AVPlayerControllerStatus) {
- AVPlayerControllerStatusUnknown = 0,
- AVPlayerControllerStatusReadyToPlay = 2,
-};
-
-typedef NS_ENUM(NSInteger, AVPlayerControllerExternalPlaybackType) {
- AVPlayerControllerExternalPlaybackTypeNone = 0,
- AVPlayerControllerExternalPlaybackTypeAirPlay = 1,
- AVPlayerControllerExternalPlaybackTypeTVOut = 2,
-};
-
-@property (NS_NONATOMIC_IOSONLY, readonly) AVPlayerControllerStatus status;
-@end
-
-#if PLATFORM(IOS_FAMILY)
-NS_ASSUME_NONNULL_BEGIN
-
@interface AVBackgroundView : UIView
@property (nonatomic) BOOL automaticallyDrawsRoundedCorners;
typedef NS_ENUM(NSInteger, AVBackgroundViewMaterialStyle) {
@@ -208,10 +203,16 @@
@end
NS_ASSUME_NONNULL_END
+
+#endif // USE(APPLE_INTERNAL_SDK)
#endif // PLATFORM(IOS_FAMILY)
#if PLATFORM(MAC)
+#if USE(APPLE_INTERNAL_SDK)
+#import <AVKit/AVPlayerView_Private.h>
+#else
#import <AVKit/AVPlayerView.h>
+
NS_ASSUME_NONNULL_BEGIN
@interface AVPlayerView (WebKitFullscreenSPI)
@@ -222,33 +223,17 @@
@end
NS_ASSUME_NONNULL_END
-#endif
#endif // USE(APPLE_INTERNAL_SDK)
+#endif // PLATFORM(MAC)
-
-#if HAVE(AVOBSERVATIONCONTROLLER)
+#if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS_FAMILY)
#if USE(APPLE_INTERNAL_SDK)
-#import <AVKit/AVObservationController.h>
-#else
-@class AVKeyValueChange;
-NS_ASSUME_NONNULL_BEGIN
-@interface AVObservationController<Owner> : NSObject
-- (instancetype)initWithOwner:(Owner)owner NS_DESIGNATED_INITIALIZER;
-- (id)startObserving:(id)object keyPath:(NSString *)keyPath includeInitialValue:(BOOL)shouldIncludeInitialValue observationHandler:(void (^)(Owner owner, id observed, AVKeyValueChange *change))observationHandler;
-- (void)stopAllObservation;
-@end
+#import <AVKit/AVOutputDeviceMenuController.h>
-NS_ASSUME_NONNULL_END
-#endif // USE(APPLE_INTERNAL_SDK)
-#endif // HAVE(AVOBSERVATIONCONTROLLER)
+#else
-
-#if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS_FAMILY)
-#if USE(APPLE_INTERNAL_SDK)
-#import <AVKit/AVOutputDeviceMenuController.h>
-#else
NS_ASSUME_NONNULL_BEGIN
@class AVOutputContext;
@@ -268,25 +253,44 @@
@end
NS_ASSUME_NONNULL_END
+
#endif // USE(APPLE_INTERNAL_SDK)
#endif // ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS_FAMILY)
+NS_ASSUME_NONNULL_BEGIN
-#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER) && PLATFORM(MAC)
-#if USE(APPLE_INTERNAL_SDK)
-#import <AVKit/AVFunctionBarPlaybackControlsProvider.h>
-#import <AVKit/AVFunctionBarScrubber.h>
-#import <AVKit/AVTouchBarMediaSelectionOption.h>
-#import <AVKit/AVTouchBarPlaybackControlsProvider.h>
-#import <AVKit/AVTouchBarScrubber.h>
-#else
-OBJC_CLASS AVFunctionBarMediaSelectionOption;
+@interface AVValueTiming : NSObject <NSCoding, NSCopying, NSMutableCopying>
+@end
+
+@interface AVValueTiming ()
++ (AVValueTiming *)valueTimingWithAnchorValue:(double)anchorValue anchorTimeStamp:(NSTimeInterval)timeStamp rate:(double)rate;
+@property (NS_NONATOMIC_IOSONLY, readonly) double currentValue;
+@property (NS_NONATOMIC_IOSONLY, readonly) double rate;
+@property (NS_NONATOMIC_IOSONLY, readonly) NSTimeInterval anchorTimeStamp;
+@property (NS_NONATOMIC_IOSONLY, readonly) double anchorValue;
+
++ (NSTimeInterval)currentTimeStamp;
+- (double)valueForTimeStamp:(NSTimeInterval)timeStamp;
+@end
+
+NS_ASSUME_NONNULL_END
+
+#if PLATFORM(MAC) && ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
+
OBJC_CLASS AVFunctionBarPlaybackControlsProvider;
OBJC_CLASS AVFunctionBarScrubber;
-OBJC_CLASS AVTouchBarMediaSelectionOption;
+OBJC_CLASS AVFunctionBarMediaSelectionOption;
OBJC_CLASS AVTouchBarPlaybackControlsProvider;
OBJC_CLASS AVTouchBarScrubber;
+OBJC_CLASS AVTouchBarMediaSelectionOption;
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <AVKit/AVTouchBarPlaybackControlsProvider.h>
+#import <AVKit/AVTouchBarScrubber.h>
+
+#else
+
NS_ASSUME_NONNULL_BEGIN
__attribute__((availability(macosx, obsoleted = 10.13))) @protocol AVFunctionBarPlaybackControlsControlling <NSObject>;
@@ -345,16 +349,22 @@
- (instancetype)initWithTitle:(nonnull NSString *)title type:(AVTouchBarMediaSelectionOptionType)type;
@end
+@class AVThumbnail;
+
NS_ASSUME_NONNULL_END
-#endif // USE(APPLE_INTERNAL_SDK)
-#endif // ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER) && PLATFORM(MAC)
+#endif
+#endif // PLATFORM(MAC) && ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
+
#if ENABLE(WIRELESS_PLAYBACK_TARGET) && HAVE(AVROUTEPICKERVIEW)
#if USE(APPLE_INTERNAL_SDK)
+
#import <AVKit/AVRoutePickerView_Private.h>
#import <AVKit/AVRoutePickerView_WebKitOnly.h>
+
#else
+
NS_ASSUME_NONNULL_BEGIN
@protocol AVRoutePickerViewDelegate;
@@ -375,5 +385,6 @@
@end
NS_ASSUME_NONNULL_END
+
#endif // USE(APPLE_INTERNAL_SDK)
#endif // ENABLE(WIRELESS_PLAYBACK_TARGET) && HAVE(AVROUTEPICKERVIEW)
