Title: [236366] trunk/Source/WebCore/PAL
- Revision
- 236366
- Author
- jer.no...@apple.com
- Date
- 2018-09-21 15:56:55 -0700 (Fri, 21 Sep 2018)
Log Message
Unreviewed Sierra Build Fix; ensure AVVideoPerformanceMetrics are defined on Sierra.
* pal/spi/mac/AVFoundationSPI.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/PAL/ChangeLog (236365 => 236366)
--- trunk/Source/WebCore/PAL/ChangeLog 2018-09-21 22:50:36 UTC (rev 236365)
+++ trunk/Source/WebCore/PAL/ChangeLog 2018-09-21 22:56:55 UTC (rev 236366)
@@ -1,5 +1,11 @@
2018-09-21 Jer Noble <jer.no...@apple.com>
+ Unreviewed Sierra Build Fix; ensure AVVideoPerformanceMetrics are defined on Sierra.
+
+ * pal/spi/mac/AVFoundationSPI.h:
+
+2018-09-21 Jer Noble <jer.no...@apple.com>
+
Move AVVideoPerformanceMetrics into AVFoundationSPI.h
https://bugs.webkit.org/show_bug.cgi?id=189842
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h (236365 => 236366)
--- trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h 2018-09-21 22:50:36 UTC (rev 236365)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h 2018-09-21 22:56:55 UTC (rev 236366)
@@ -157,6 +157,9 @@
#endif // !PLATFORM(IOS)
+#endif // USE(APPLE_INTERNAL_SDK)
+
+#if !USE(APPLE_INTERNAL_SDK) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101300)
@interface AVVideoPerformanceMetrics : NSObject
@property (nonatomic, readonly) unsigned long totalNumberOfVideoFrames;
@property (nonatomic, readonly) unsigned long numberOfDroppedVideoFrames;
@@ -164,9 +167,8 @@
@property (nonatomic, readonly) unsigned long numberOfNonDisplayCompositedVideoFrames;
@property (nonatomic, readonly) double totalFrameDelay;
@end
+#endif
-#endif // USE(APPLE_INTERNAL_SDK)
-
#if PLATFORM(MAC) && !USE(APPLE_INTERNAL_SDK)
NS_ASSUME_NONNULL_BEGIN
@interface AVStreamDataParser (AVStreamDataParserPrivate)
@@ -236,6 +238,11 @@
#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 110000)) && __has_include(<AVFoundation/AVQueuedSampleBufferRendering.h>)
#import <AVFoundation/AVQueuedSampleBufferRendering.h>
+NS_ASSUME_NONNULL_BEGIN
+@interface AVSampleBufferDisplayLayer (VideoPerformanceMetrics)
+- (AVVideoPerformanceMetrics *)videoPerformanceMetrics;
+@end
+NS_ASSUME_NONNULL_END
#elif __has_include(<AVFoundation/AVSampleBufferDisplayLayer_Private.h>)
#import <AVFoundation/AVSampleBufferDisplayLayer_Private.h>
#elif __has_include(<AVFoundation/AVSampleBufferDisplayLayer.h>)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
