Changeset 294950 in webkit

Timestamp:

May 27, 2022, 1:14:24 PM (3 years ago)

Author:

J Pascoe

Message:

[WebAuthn] Forward declare ASC SPI for internal needs.
​https://bugs.webkit.org/show_bug.cgi?id=240928
rdar://problem/93930713

Reviewed by Brent Fulgham.

This fixes the build after an internal change for older macOS.

• Source/WebKit/Platform/spi/Cocoa/AuthenticationServicesCoreSPI.h:
• Source/WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm:

Remove unused import that isn't present in older macOS sdk.

Canonical link: ​https://commits.webkit.org/251058@main

Location:

trunk/Source

Files:

• WTF/wtf/PlatformHave.h (modified) (1 diff)
• WebKit/Platform/spi/Cocoa/AuthenticationServicesCoreSPI.h (modified) (1 diff)
• WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm (modified) (1 diff)

trunk/Source/WTF/wtf/PlatformHave.h

@@ -831 +831 @@
 #endif
 
+#if PLATFORM(IOS) \
+    || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000)
+#define HAVE_ASC_WEBKIT_SPI 1
+#endif
+
 #if PLATFORM(MAC)
 #if !defined(HAVE_MT_PLUGIN_FORMAT_READER)

trunk/Source/WebKit/Platform/spi/Cocoa/AuthenticationServicesCoreSPI.h

@@ -28 +28 @@
 #if HAVE(ASC_AUTH_UI) || HAVE(UNIFIED_ASC_AUTH_UI)
 
-#if USE(APPLE_INTERNAL_SDK)
+#if USE(APPLE_INTERNAL_SDK) && HAVE(ASC_WEBKIT_SPI)
 #import <AuthenticationServicesCore/ASCWebKitSPISupport.h>
 #else

trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm

@@ -33 +33 @@
 #import "WebAuthenticationRequestData.h"
 #import "WebPageProxy.h"
-#import <AuthenticationServices/ASCOSEConstants.h>
 #import <WebCore/AuthenticatorAttachment.h>
 #import <WebCore/AuthenticatorResponseData.h>