Source/WebCore/PAL:

Unreviewed build fix after r279912 (239661@main); Adopt HAVE(SYSTEM_STATUS) macro. * pal/ios/SystemStatusSoftLink.h: * pal/ios/SystemStatusSoftLink.mm: Source/WebKit: Unreviewed build fix after r279912 (239661@main); Adopt HAVE(SYSTEM_STATUS) macro. * GPUProcess/cocoa/GPUConnectionToWebProcessCocoa.mm: (WebKit::GPUConnectionToWebProcess::setCaptureAttributionString): * Platform/spi/ios/SystemStatusSPI.h: Source/WTF: Unreviewed build fix after r279912 (239661@main); Add a HAVE(SYSTEM_STATUS) macro. * wtf/PlatformHave.h: Canonical link: https://commits.webkit.org/239676@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@279929 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Jul 14, 2021 · 5bb48550c05866c11fbc8173a0a68c783d2c7614 · 5bb4855
1 parent 7767f65
commit 5bb48550c05866c11fbc8173a0a68c783d2c7614
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 3 deletions.
diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
@@ -1,3 +1,9 @@
+2021-07-14  Jer Noble  <jer.noble@apple.com>
+
+        Unreviewed build fix after r279912 (239661@main); Add a HAVE(SYSTEM_STATUS) macro.
+
+        * wtf/PlatformHave.h:
+
 2021-07-13  Alex Christensen  <achristensen@webkit.org>
 
         Update and fix URL WPT tests

diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h
@@ -1105,3 +1105,7 @@
     || (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 140500))
 #define HAVE_AVSAMPLEBUFFERRENDERSYNCHRONIZER_RATEATHOSTTIME 1
 #endif
+
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000
+#define HAVE_SYSTEM_STATUS 1
+#endif
diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
@@ -1,3 +1,10 @@
+2021-07-14  Jer Noble  <jer.noble@apple.com>
+
+        Unreviewed build fix after r279912 (239661@main); Adopt HAVE(SYSTEM_STATUS) macro.
+
+        * pal/ios/SystemStatusSoftLink.h:
+        * pal/ios/SystemStatusSoftLink.mm:
+
 2021-07-14  Eric Carlson  <eric.carlson@apple.com>
 
         [iOS] Dynamically set capture attribution

diff --git a/Source/WebCore/PAL/pal/ios/SystemStatusSoftLink.h b/Source/WebCore/PAL/pal/ios/SystemStatusSoftLink.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
+#if HAVE(SYSTEM_STATUS)
 
 #import <wtf/SoftLinking.h>
 

diff --git a/Source/WebCore/PAL/pal/ios/SystemStatusSoftLink.mm b/Source/WebCore/PAL/pal/ios/SystemStatusSoftLink.mm
@@ -25,7 +25,7 @@
 
 #import "config.h"
 
-#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
+#if HAVE(SYSTEM_STATUS)
 
 #import <wtf/SoftLinking.h>
 

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2021-07-14  Jer Noble  <jer.noble@apple.com>
+
+        Unreviewed build fix after r279912 (239661@main); Adopt HAVE(SYSTEM_STATUS) macro.
+
+        * GPUProcess/cocoa/GPUConnectionToWebProcessCocoa.mm:
+        (WebKit::GPUConnectionToWebProcess::setCaptureAttributionString):
+        * Platform/spi/ios/SystemStatusSPI.h:
+
 2021-07-14  Michael Saboff  <msaboff@apple.com>
 
         [macOS] Add new entitlement to limit process to a single JIT region

diff --git a/Source/WebKit/GPUProcess/cocoa/GPUConnectionToWebProcessCocoa.mm b/Source/WebKit/GPUProcess/cocoa/GPUConnectionToWebProcessCocoa.mm
@@ -39,7 +39,7 @@
 #if ENABLE(MEDIA_STREAM)
 bool GPUConnectionToWebProcess::setCaptureAttributionString()
 {
-#if PLATFORM(IOS)
+#if HAVE(SYSTEM_STATUS)
     if (![PAL::getSTDynamicActivityAttributionPublisherClass() respondsToSelector:@selector(setCurrentAttributionStringWithFormat:auditToken:)])
         return true;
 

diff --git a/Source/WebKit/Platform/spi/ios/SystemStatusSPI.h b/Source/WebKit/Platform/spi/ios/SystemStatusSPI.h
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE(SYSTEM_STATUS)
 #if USE(APPLE_INTERNAL_SDK)
 
 #import <SystemStatus/STDynamicActivityAttributionPublisher.h>
@@ -40,3 +41,4 @@ NS_ASSUME_NONNULL_BEGIN
 NS_ASSUME_NONNULL_END
 
 #endif // USE(APPLE_INTERNAL_SDK)
+#endif // HAVE(SYSTEM_STATUS)