Title: [236526] tags/Safari-607.1.7.3/Source/WebCore/PAL
- Revision
- 236526
- Author
- kocsen_ch...@apple.com
- Date
- 2018-09-26 14:53:14 -0700 (Wed, 26 Sep 2018)
Log Message
Cherry-pick r236366. rdar://problem/44808777
Unreviewed Sierra Build Fix; ensure AVVideoPerformanceMetrics are defined on Sierra.
* pal/spi/mac/AVFoundationSPI.h:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@236366 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: tags/Safari-607.1.7.3/Source/WebCore/PAL/ChangeLog (236525 => 236526)
--- tags/Safari-607.1.7.3/Source/WebCore/PAL/ChangeLog 2018-09-26 21:53:08 UTC (rev 236525)
+++ tags/Safari-607.1.7.3/Source/WebCore/PAL/ChangeLog 2018-09-26 21:53:14 UTC (rev 236526)
@@ -1,5 +1,21 @@
2018-09-26 Babak Shafiei <bshaf...@apple.com>
+ Cherry-pick r236366. rdar://problem/44808777
+
+ Unreviewed Sierra Build Fix; ensure AVVideoPerformanceMetrics are defined on Sierra.
+
+ * pal/spi/mac/AVFoundationSPI.h:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@236366 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 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-26 Babak Shafiei <bshaf...@apple.com>
+
Cherry-pick r236350. rdar://problem/44808777
Move AVVideoPerformanceMetrics into AVFoundationSPI.h
Modified: tags/Safari-607.1.7.3/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h (236525 => 236526)
--- tags/Safari-607.1.7.3/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h 2018-09-26 21:53:08 UTC (rev 236525)
+++ tags/Safari-607.1.7.3/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h 2018-09-26 21:53:14 UTC (rev 236526)
@@ -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