Diff
Modified: branches/safari-612-branch/Source/WTF/ChangeLog (284949 => 284950)
--- branches/safari-612-branch/Source/WTF/ChangeLog 2021-10-27 21:05:54 UTC (rev 284949)
+++ branches/safari-612-branch/Source/WTF/ChangeLog 2021-10-27 21:05:57 UTC (rev 284950)
@@ -1,3 +1,50 @@
+2021-10-26 Alan Coon <[email protected]>
+
+ Cherry-pick r284344. rdar://problem/84625558
+
+ Build fix #3: Adopt attribution AVCaptureSession SPI for GPU process
+ https://bugs.webkit.org/show_bug.cgi?id=231621
+ <rdar://problem/80748535>
+
+ Unreviewed build fix.
+
+
+ Source/WebCore/PAL:
+
+ * pal/spi/cocoa/TCCSPI.h:
+ - Use HAVE(TCC_IOS_14_BIG_SUR_SPI).
+
+ Source/WebKit:
+
+ * Shared/Cocoa/TCCSoftLink.h:
+ (tcc_identity_create):
+ * Shared/Cocoa/TCCSoftLink.mm:
+ (tcc_identity_create):
+ - Use HAVE(TCC_IOS_14_BIG_SUR_SPI).
+
+ Source/WTF:
+
+ * wtf/PlatformHave.h:
+ (HAVE_TCC_IOS_14_BIG_SUR_SPI): Add.
+ - Used for TCC.framework SPI available in iOS 14 and macOS 11
+ Big Sur and later.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284344 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-10-17 David Kilzer <[email protected]>
+
+ Build fix #3: Adopt attribution AVCaptureSession SPI for GPU process
+ https://bugs.webkit.org/show_bug.cgi?id=231621
+ <rdar://problem/80748535>
+
+ Unreviewed build fix.
+
+ * wtf/PlatformHave.h:
+ (HAVE_TCC_IOS_14_BIG_SUR_SPI): Add.
+ - Used for TCC.framework SPI available in iOS 14 and macOS 11
+ Big Sur and later.
+
2021-10-27 Alan Coon <[email protected]>
Cherry-pick r283662. rdar://problem/84717723
Modified: branches/safari-612-branch/Source/WTF/wtf/PlatformHave.h (284949 => 284950)
--- branches/safari-612-branch/Source/WTF/wtf/PlatformHave.h 2021-10-27 21:05:54 UTC (rev 284949)
+++ branches/safari-612-branch/Source/WTF/wtf/PlatformHave.h 2021-10-27 21:05:57 UTC (rev 284950)
@@ -847,6 +847,12 @@
#endif
#endif
+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
+#if !defined(HAVE_TCC_IOS_14_BIG_SUR_SPI)
+#define HAVE_TCC_IOS_14_BIG_SUR_SPI 1
+#endif
+#endif
+
#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000
#if !defined(HAVE_SPEECHSYNTHESIS_MONTEREY_SPI)
#define HAVE_SPEECHSYNTHESIS_MONTEREY_SPI 1
Modified: branches/safari-612-branch/Source/WebCore/PAL/ChangeLog (284949 => 284950)
--- branches/safari-612-branch/Source/WebCore/PAL/ChangeLog 2021-10-27 21:05:54 UTC (rev 284949)
+++ branches/safari-612-branch/Source/WebCore/PAL/ChangeLog 2021-10-27 21:05:57 UTC (rev 284950)
@@ -1,5 +1,50 @@
2021-10-26 Alan Coon <[email protected]>
+ Cherry-pick r284344. rdar://problem/84625558
+
+ Build fix #3: Adopt attribution AVCaptureSession SPI for GPU process
+ https://bugs.webkit.org/show_bug.cgi?id=231621
+ <rdar://problem/80748535>
+
+ Unreviewed build fix.
+
+
+ Source/WebCore/PAL:
+
+ * pal/spi/cocoa/TCCSPI.h:
+ - Use HAVE(TCC_IOS_14_BIG_SUR_SPI).
+
+ Source/WebKit:
+
+ * Shared/Cocoa/TCCSoftLink.h:
+ (tcc_identity_create):
+ * Shared/Cocoa/TCCSoftLink.mm:
+ (tcc_identity_create):
+ - Use HAVE(TCC_IOS_14_BIG_SUR_SPI).
+
+ Source/WTF:
+
+ * wtf/PlatformHave.h:
+ (HAVE_TCC_IOS_14_BIG_SUR_SPI): Add.
+ - Used for TCC.framework SPI available in iOS 14 and macOS 11
+ Big Sur and later.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284344 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-10-17 David Kilzer <[email protected]>
+
+ Build fix #3: Adopt attribution AVCaptureSession SPI for GPU process
+ https://bugs.webkit.org/show_bug.cgi?id=231621
+ <rdar://problem/80748535>
+
+ Unreviewed build fix.
+
+ * pal/spi/cocoa/TCCSPI.h:
+ - Use HAVE(TCC_IOS_14_BIG_SUR_SPI).
+
+2021-10-26 Alan Coon <[email protected]>
+
Cherry-pick r284222. rdar://problem/84625558
Fix non-internal iOS builds after r284220
Modified: branches/safari-612-branch/Source/WebCore/PAL/pal/spi/cocoa/TCCSPI.h (284949 => 284950)
--- branches/safari-612-branch/Source/WebCore/PAL/pal/spi/cocoa/TCCSPI.h 2021-10-27 21:05:54 UTC (rev 284949)
+++ branches/safari-612-branch/Source/WebCore/PAL/pal/spi/cocoa/TCCSPI.h 2021-10-27 21:05:57 UTC (rev 284950)
@@ -36,8 +36,10 @@
kTCCAccessPreflightDenied,
} TCCAccessPreflightResult;
+#if HAVE(TCC_IOS_14_BIG_SUR_SPI)
typedef uint64_t tcc_identity_type_t;
constexpr tcc_identity_type_t TCC_IDENTITY_CODE_BUNDLE_ID = 0;
typedef void* tcc_identity_t;
+#endif // HAVE(TCC_IOS_14_BIG_SUR_SPI)
#endif
Modified: branches/safari-612-branch/Source/WebKit/ChangeLog (284949 => 284950)
--- branches/safari-612-branch/Source/WebKit/ChangeLog 2021-10-27 21:05:54 UTC (rev 284949)
+++ branches/safari-612-branch/Source/WebKit/ChangeLog 2021-10-27 21:05:57 UTC (rev 284950)
@@ -1,5 +1,53 @@
2021-10-26 Alan Coon <[email protected]>
+ Cherry-pick r284344. rdar://problem/84625558
+
+ Build fix #3: Adopt attribution AVCaptureSession SPI for GPU process
+ https://bugs.webkit.org/show_bug.cgi?id=231621
+ <rdar://problem/80748535>
+
+ Unreviewed build fix.
+
+
+ Source/WebCore/PAL:
+
+ * pal/spi/cocoa/TCCSPI.h:
+ - Use HAVE(TCC_IOS_14_BIG_SUR_SPI).
+
+ Source/WebKit:
+
+ * Shared/Cocoa/TCCSoftLink.h:
+ (tcc_identity_create):
+ * Shared/Cocoa/TCCSoftLink.mm:
+ (tcc_identity_create):
+ - Use HAVE(TCC_IOS_14_BIG_SUR_SPI).
+
+ Source/WTF:
+
+ * wtf/PlatformHave.h:
+ (HAVE_TCC_IOS_14_BIG_SUR_SPI): Add.
+ - Used for TCC.framework SPI available in iOS 14 and macOS 11
+ Big Sur and later.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284344 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-10-17 David Kilzer <[email protected]>
+
+ Build fix #3: Adopt attribution AVCaptureSession SPI for GPU process
+ https://bugs.webkit.org/show_bug.cgi?id=231621
+ <rdar://problem/80748535>
+
+ Unreviewed build fix.
+
+ * Shared/Cocoa/TCCSoftLink.h:
+ (tcc_identity_create):
+ * Shared/Cocoa/TCCSoftLink.mm:
+ (tcc_identity_create):
+ - Use HAVE(TCC_IOS_14_BIG_SUR_SPI).
+
+2021-10-26 Alan Coon <[email protected]>
+
Cherry-pick r284251. rdar://problem/84625558
Unreviewed maccatalyst build fix.
Modified: branches/safari-612-branch/Source/WebKit/Shared/Cocoa/TCCSoftLink.h (284949 => 284950)
--- branches/safari-612-branch/Source/WebKit/Shared/Cocoa/TCCSoftLink.h 2021-10-27 21:05:54 UTC (rev 284949)
+++ branches/safari-612-branch/Source/WebKit/Shared/Cocoa/TCCSoftLink.h 2021-10-27 21:05:57 UTC (rev 284950)
@@ -43,5 +43,7 @@
#define TCCAccessPreflight WebKit::softLink_TCC_TCCAccessPreflight
SOFT_LINK_FUNCTION_FOR_HEADER(WebKit, TCC, TCCAccessPreflightWithAuditToken, TCCAccessPreflightResult, (CFStringRef service, audit_token_t token, CFDictionaryRef options), (service, token, options))
#define TCCAccessPreflightWithAuditToken WebKit::softLink_TCC_TCCAccessPreflightWithAuditToken
+#if HAVE(TCC_IOS_14_BIG_SUR_SPI)
SOFT_LINK_FUNCTION_FOR_HEADER(WebKit, TCC, tcc_identity_create, tcc_identity_t, (tcc_identity_type_t type, const char * identifier), (type, identifier));
#define tcc_identity_create WebKit::softLink_TCC_tcc_identity_create
+#endif // HAVE(TCC_IOS_14_BIG_SUR_SPI)
Modified: branches/safari-612-branch/Source/WebKit/Shared/Cocoa/TCCSoftLink.mm (284949 => 284950)
--- branches/safari-612-branch/Source/WebKit/Shared/Cocoa/TCCSoftLink.mm 2021-10-27 21:05:54 UTC (rev 284949)
+++ branches/safari-612-branch/Source/WebKit/Shared/Cocoa/TCCSoftLink.mm 2021-10-27 21:05:57 UTC (rev 284950)
@@ -40,4 +40,6 @@
SOFT_LINK_FUNCTION_FOR_SOURCE(WebKit, TCC, TCCAccessCheckAuditToken, Boolean, (CFStringRef service, audit_token_t auditToken, CFDictionaryRef options), (service, auditToken, options))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebKit, TCC, TCCAccessPreflight, TCCAccessPreflightResult, (CFStringRef service, CFDictionaryRef options), (service, options))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebKit, TCC, TCCAccessPreflightWithAuditToken, TCCAccessPreflightResult, (CFStringRef service, audit_token_t token, CFDictionaryRef options), (service, token, options))
+#if HAVE(TCC_IOS_14_BIG_SUR_SPI)
SOFT_LINK_FUNCTION_FOR_SOURCE(WebKit, TCC, tcc_identity_create, tcc_identity_t, (tcc_identity_type_t type, const char * identifier), (type, identifier));
+#endif // HAVE(TCC_IOS_14_BIG_SUR_SPI)
