Diff
Modified: branches/safari-612.1.9-branch/Source/WTF/ChangeLog (275371 => 275372)
--- branches/safari-612.1.9-branch/Source/WTF/ChangeLog 2021-04-01 18:50:22 UTC (rev 275371)
+++ branches/safari-612.1.9-branch/Source/WTF/ChangeLog 2021-04-01 18:53:27 UTC (rev 275372)
@@ -1,3 +1,34 @@
+2021-04-01 Russell Epstein <[email protected]>
+
+ Cherry-pick r275370. rdar://problem/76113438
+
+ Allow ASCWebKitSPISupport to be used on macOS
+ https://bugs.webkit.org/show_bug.cgi?id=224036
+ <rdar://76028645>
+
+ Reviewed by Brent Fulgham.
+
+ Source/WebKit:
+
+ * UIProcess/WebAuthentication/Cocoa/AuthenticationServicesCoreSoftLink.h:
+ * UIProcess/WebAuthentication/Cocoa/AuthenticationServicesCoreSoftLink.mm:
+
+ Source/WTF:
+
+ * wtf/PlatformHave.h:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275370 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-03-31 Jiewen Tan <[email protected]>
+
+ Allow ASCWebKitSPISupport to be used on macOS
+ https://bugs.webkit.org/show_bug.cgi?id=224036
+ <rdar://76028645>
+
+ Reviewed by Brent Fulgham.
+
+ * wtf/PlatformHave.h:
+
2021-03-28 Sam Weinig <[email protected]>
Remove ENABLE_INDEXED_DATABASE & ENABLE_INDEXED_DATABASE_IN_WORKERS, it seems like it is on for all ports
Modified: branches/safari-612.1.9-branch/Source/WTF/wtf/PlatformHave.h (275371 => 275372)
--- branches/safari-612.1.9-branch/Source/WTF/wtf/PlatformHave.h 2021-04-01 18:50:22 UTC (rev 275371)
+++ branches/safari-612.1.9-branch/Source/WTF/wtf/PlatformHave.h 2021-04-01 18:53:27 UTC (rev 275372)
@@ -854,7 +854,7 @@
#define HAVE_LIBXSLT_FIX_FOR_RADAR_71864140 1
#endif
-#if __has_include(<AuthenticationServicesCore/ASCAuthorizationPresenter.h>) && PLATFORM(IOS)
+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 140400)
#define HAVE_ASC_AUTH_UI 1
#endif
Modified: branches/safari-612.1.9-branch/Source/WebKit/ChangeLog (275371 => 275372)
--- branches/safari-612.1.9-branch/Source/WebKit/ChangeLog 2021-04-01 18:50:22 UTC (rev 275371)
+++ branches/safari-612.1.9-branch/Source/WebKit/ChangeLog 2021-04-01 18:53:27 UTC (rev 275372)
@@ -1,3 +1,35 @@
+2021-04-01 Russell Epstein <[email protected]>
+
+ Cherry-pick r275370. rdar://problem/76113438
+
+ Allow ASCWebKitSPISupport to be used on macOS
+ https://bugs.webkit.org/show_bug.cgi?id=224036
+ <rdar://76028645>
+
+ Reviewed by Brent Fulgham.
+
+ Source/WebKit:
+
+ * UIProcess/WebAuthentication/Cocoa/AuthenticationServicesCoreSoftLink.h:
+ * UIProcess/WebAuthentication/Cocoa/AuthenticationServicesCoreSoftLink.mm:
+
+ Source/WTF:
+
+ * wtf/PlatformHave.h:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275370 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-03-31 Jiewen Tan <[email protected]>
+
+ Allow ASCWebKitSPISupport to be used on macOS
+ https://bugs.webkit.org/show_bug.cgi?id=224036
+ <rdar://76028645>
+
+ Reviewed by Brent Fulgham.
+
+ * UIProcess/WebAuthentication/Cocoa/AuthenticationServicesCoreSoftLink.h:
+ * UIProcess/WebAuthentication/Cocoa/AuthenticationServicesCoreSoftLink.mm:
+
2021-03-31 Alan Coon <[email protected]>
Cherry-pick r275248. rdar://problem/76054448
Modified: branches/safari-612.1.9-branch/Source/WebKit/UIProcess/WebAuthentication/Cocoa/AuthenticationServicesCoreSoftLink.h (275371 => 275372)
--- branches/safari-612.1.9-branch/Source/WebKit/UIProcess/WebAuthentication/Cocoa/AuthenticationServicesCoreSoftLink.h 2021-04-01 18:50:22 UTC (rev 275371)
+++ branches/safari-612.1.9-branch/Source/WebKit/UIProcess/WebAuthentication/Cocoa/AuthenticationServicesCoreSoftLink.h 2021-04-01 18:53:27 UTC (rev 275372)
@@ -28,16 +28,17 @@
#import "AuthenticationServicesCoreSPI.h"
#import <wtf/SoftLinking.h>
+SOFT_LINK_FRAMEWORK_FOR_HEADER(WebKit, AuthenticationServicesCore);
+
+SOFT_LINK_CLASS_FOR_HEADER(WebKit, ASCWebKitSPISupport);
+
#if HAVE(ASC_AUTH_UI)
-SOFT_LINK_FRAMEWORK_FOR_HEADER(WebKit, AuthenticationServicesCore);
-
SOFT_LINK_CLASS_FOR_HEADER(WebKit, ASCAuthorizationPresenter);
SOFT_LINK_CLASS_FOR_HEADER(WebKit, ASCAuthorizationPresentationContext);
SOFT_LINK_CLASS_FOR_HEADER(WebKit, ASCPlatformPublicKeyCredentialLoginChoice);
SOFT_LINK_CLASS_FOR_HEADER(WebKit, ASCSecurityKeyPublicKeyCredentialLoginChoice);
SOFT_LINK_CLASS_FOR_HEADER(WebKit, ASCAppleIDCredential);
-SOFT_LINK_CLASS_FOR_HEADER(WebKit, ASCWebKitSPISupport);
SOFT_LINK_CONSTANT_FOR_HEADER(WebKit, AuthenticationServicesCore, ASCAuthorizationErrorDomain, NSErrorDomain);
#define ASCAuthorizationErrorDomain WebKit::get_AuthenticationServicesCore_ASCAuthorizationErrorDomain()
Modified: branches/safari-612.1.9-branch/Source/WebKit/UIProcess/WebAuthentication/Cocoa/AuthenticationServicesCoreSoftLink.mm (275371 => 275372)
--- branches/safari-612.1.9-branch/Source/WebKit/UIProcess/WebAuthentication/Cocoa/AuthenticationServicesCoreSoftLink.mm 2021-04-01 18:50:22 UTC (rev 275371)
+++ branches/safari-612.1.9-branch/Source/WebKit/UIProcess/WebAuthentication/Cocoa/AuthenticationServicesCoreSoftLink.mm 2021-04-01 18:53:27 UTC (rev 275372)
@@ -28,16 +28,17 @@
#import "AuthenticationServicesCoreSPI.h"
#import <wtf/SoftLinking.h>
+SOFT_LINK_PRIVATE_FRAMEWORK_FOR_SOURCE(WebKit, AuthenticationServicesCore);
+
+SOFT_LINK_CLASS_FOR_SOURCE(WebKit, AuthenticationServicesCore, ASCWebKitSPISupport);
+
#if HAVE(ASC_AUTH_UI)
-SOFT_LINK_PRIVATE_FRAMEWORK_FOR_SOURCE(WebKit, AuthenticationServicesCore);
-
SOFT_LINK_CLASS_FOR_SOURCE(WebKit, AuthenticationServicesCore, ASCAuthorizationPresenter);
SOFT_LINK_CLASS_FOR_SOURCE(WebKit, AuthenticationServicesCore, ASCAuthorizationPresentationContext);
SOFT_LINK_CLASS_FOR_SOURCE(WebKit, AuthenticationServicesCore, ASCPlatformPublicKeyCredentialLoginChoice);
SOFT_LINK_CLASS_FOR_SOURCE(WebKit, AuthenticationServicesCore, ASCSecurityKeyPublicKeyCredentialLoginChoice);
SOFT_LINK_CLASS_FOR_SOURCE(WebKit, AuthenticationServicesCore, ASCAppleIDCredential);
-SOFT_LINK_CLASS_FOR_SOURCE(WebKit, AuthenticationServicesCore, ASCWebKitSPISupport);
SOFT_LINK_CONSTANT_FOR_SOURCE(WebKit, AuthenticationServicesCore, ASCAuthorizationErrorDomain, NSErrorDomain);
SOFT_LINK_CONSTANT_FOR_SOURCE(WebKit, AuthenticationServicesCore, ASCPINValidationResultKey, NSString*);
