Changeset 290083 in webkit

Timestamp:

Feb 17, 2022, 3:29:34 PM (4 years ago)

Author:

Kocsen Chung

Message:

Cherry-pick r290076. rdar://problem/89076606

[Cocoa] Make AVFoundationSPI.h robust against changes in system headers
​https://bugs.webkit.org/show_bug.cgi?id=236787

Reviewed by Eric Carlson.

Source/WebCore/PAL:

Only re-declare classes and add categories for non-Apple Internal builds, or when those
definitions would be missing from system headers. The presence of the classes and their
methods are already checked at runtime, so this is a build-only change.

• pal/spi/cocoa/AVFoundationSPI.h:

Source/WTF:

• wtf/PlatformHave.h:

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@290076 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-614.1.4-branch/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/PlatformHave.h (modified) (1 diff)
• WebCore/PAL/ChangeLog (modified) (1 diff)
• WebCore/PAL/pal/spi/cocoa/AVFoundationSPI.h (modified) (4 diffs)

branches/safari-614.1.4-branch/Source/WTF/ChangeLog

@@ +1 @@
+2022-02-17  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r290076. rdar://problem/89076606
+
+    [Cocoa] Make AVFoundationSPI.h robust against changes in system headers
+    https://bugs.webkit.org/show_bug.cgi?id=236787
+    
+    Reviewed by Eric Carlson.
+    
+    Source/WebCore/PAL:
+    
+    Only re-declare classes and add categories for non-Apple Internal builds, or when those
+    definitions would be missing from system headers. The presence of the classes and their
+    methods are already checked at runtime, so this is a build-only change.
+    
+    * pal/spi/cocoa/AVFoundationSPI.h:
+    
+    Source/WTF:
+    
+    * wtf/PlatformHave.h:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@290076 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-02-17  Jer Noble  <jer.noble@apple.com>
+
+            [Cocoa] Make AVFoundationSPI.h robust against changes in system headers
+            https://bugs.webkit.org/show_bug.cgi?id=236787
+
+            Reviewed by Eric Carlson.
+
+            * wtf/PlatformHave.h:
+
 2022-02-13  Matt Woodrow  <mattwoodrow@apple.com>
 

branches/safari-614.1.4-branch/Source/WTF/wtf/PlatformHave.h

@@ -389 +389 @@
 #endif
 
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101504) \
+    || (((PLATFORM(IOS) && !PLATFORM(IOS_FAMILY_SIMULATOR)) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130400) \
+    || (PLATFORM(WATCHOS) && !PLATFORM(IOS_FAMILY_SIMULATOR) && __WATCH_OS_VERSION_MAX_ALLOWED >= 60400) \
+    || (PLATFORM(APPLETV) && !PLATFORM(IOS_FAMILY_SIMULATOR) && __TV_OS_VERSION_MAX_ALLOWED >= 130400)
+#define HAVE_AVCONTENTKEYREPORTGROUP 1
+#endif
+
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) \
+    || (((PLATFORM(IOS) && !PLATFORM(IOS_FAMILY_SIMULATOR)) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000)
+#define HAVE_AVCONTENTKEYSESSIONWILLOUTPUTBEOBSCURED 1
+#endif
+
 #if PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(MACCATALYST)
 #define HAVE_SEC_KEY_PROXY 1

branches/safari-614.1.4-branch/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2022-02-17  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r290076. rdar://problem/89076606
+
+    [Cocoa] Make AVFoundationSPI.h robust against changes in system headers
+    https://bugs.webkit.org/show_bug.cgi?id=236787
+    
+    Reviewed by Eric Carlson.
+    
+    Source/WebCore/PAL:
+    
+    Only re-declare classes and add categories for non-Apple Internal builds, or when those
+    definitions would be missing from system headers. The presence of the classes and their
+    methods are already checked at runtime, so this is a build-only change.
+    
+    * pal/spi/cocoa/AVFoundationSPI.h:
+    
+    Source/WTF:
+    
+    * wtf/PlatformHave.h:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@290076 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-02-17  Jer Noble  <jer.noble@apple.com>
+
+            [Cocoa] Make AVFoundationSPI.h robust against changes in system headers
+            https://bugs.webkit.org/show_bug.cgi?id=236787
+
+            Reviewed by Eric Carlson.
+
+            Only re-declare classes and add categories for non-Apple Internal builds, or when those
+            definitions would be missing from system headers. The presence of the classes and their
+            methods are already checked at runtime, so this is a build-only change.
+
+            * pal/spi/cocoa/AVFoundationSPI.h:
+
 2022-02-12  Jer Noble  <jer.noble@apple.com>
 

branches/safari-614.1.4-branch/Source/WebCore/PAL/pal/spi/cocoa/AVFoundationSPI.h

@@ -38 +38 @@
 #import <AVFoundation/AVAssetCache_Private.h>
 #import <AVFoundation/AVCaptureSession_Private.h>
+#import <AVFoundation/AVContentKeySession_Private.h>
 #import <AVFoundation/AVMediaSelectionGroup_Private.h>
 #import <AVFoundation/AVOutputContext_Private.h>
@@ -225 +226 @@
 
 #if HAVE(AVCONTENTKEYSESSION)
+
+#if !USE(APPLE_INTERNAL_SDK) || !HAVE(AVCONTENTKEYREPORTGROUP)
 @interface AVContentKeyReportGroup : NSObject
 @property (readonly, nullable) NSData *contentProtectionSessionIdentifier;
@@ -236 +239 @@
 - (nonnull AVContentKeyReportGroup *)makeContentKeyGroup;
 @end
-
+#endif
+
+#if !USE(APPLE_INTERNAL_SDK) || !HAVE(AVCONTENTKEYSESSIONWILLOUTPUTBEOBSCURED)
 @interface AVContentKeyRequest (OutputObscured)
 NS_ASSUME_NONNULL_BEGIN
@@ -242 +247 @@
 NS_ASSUME_NONNULL_END
 @end
-
-#if HAVE(AVCONTENTKEYREQUEST_PENDING_PROTECTION_STATUS)
+#endif
+
+#if !USE(APPLE_INTERNAL_SDK) || !HAVE(AVCONTENTKEYREQUEST_PENDING_PROTECTION_STATUS)
 typedef NS_ENUM(NSInteger, AVExternalContentProtectionStatus) {
     AVExternalContentProtectionStatusPending      = 0,