Changeset 236526 in webkit

Timestamp:

Sep 26, 2018, 2:53:14 PM (8 years ago)

Author:

Kocsen Chung

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

Location:

tags/Safari-607.1.7.3/Source/WebCore/PAL

Files:

• ChangeLog (modified) (1 diff)
• pal/spi/mac/AVFoundationSPI.h (modified) (3 diffs)

tags/Safari-607.1.7.3/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2018-09-26  Babak Shafiei  <bshafiei@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.noble@apple.com>
+
+            Unreviewed Sierra Build Fix; ensure AVVideoPerformanceMetrics are defined on Sierra.
+
+            * pal/spi/mac/AVFoundationSPI.h:
+
 2018-09-26  Babak Shafiei  <bshafiei@apple.com>
 

tags/Safari-607.1.7.3/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h

@@ -158 +158 @@
 #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;
@@ -165 +168 @@
 @property (nonatomic, readonly) double totalFrameDelay;
 @end
-
-#endif // USE(APPLE_INTERNAL_SDK)
+#endif
 
 #if PLATFORM(MAC) && !USE(APPLE_INTERNAL_SDK)
@@ -237 +239 @@
 #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>