Title: [246527] trunk/Source/WebKit
- Revision
- 246527
- Author
- [email protected]
- Date
- 2019-06-17 17:26:23 -0700 (Mon, 17 Jun 2019)
Log Message
Unreviewed, build fix after r246514
* UIProcess/Cocoa/SOAuthorization/SOAuthorizationNSURLExtras.h:
* UIProcess/Cocoa/SOAuthorization/SOAuthorizationNSURLExtras.mm:
(+[NSURL _web_canPerformAuthorizationWithURL:]):
Expose the above method as a SPI for Safari.
* WebKit.xcodeproj/project.pbxproj:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (246526 => 246527)
--- trunk/Source/WebKit/ChangeLog 2019-06-18 00:17:24 UTC (rev 246526)
+++ trunk/Source/WebKit/ChangeLog 2019-06-18 00:26:23 UTC (rev 246527)
@@ -1,3 +1,13 @@
+2019-06-17 Jiewen Tan <[email protected]>
+
+ Unreviewed, build fix after r246514
+
+ * UIProcess/Cocoa/SOAuthorization/SOAuthorizationNSURLExtras.h:
+ * UIProcess/Cocoa/SOAuthorization/SOAuthorizationNSURLExtras.mm:
+ (+[NSURL _web_canPerformAuthorizationWithURL:]):
+ Expose the above method as a SPI for Safari.
+ * WebKit.xcodeproj/project.pbxproj:
+
2019-06-17 Alex Christensen <[email protected]>
Protect StorageManager::m_localStorageNamespaces with a Lock
Modified: trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationNSURLExtras.h (246526 => 246527)
--- trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationNSURLExtras.h 2019-06-18 00:17:24 UTC (rev 246526)
+++ trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationNSURLExtras.h 2019-06-18 00:26:23 UTC (rev 246527)
@@ -25,8 +25,6 @@
#pragma once
-#if HAVE(APP_SSO)
-
// FIXME rdar://problem/50028246 Remove the following once the radar is fixed.
@interface NSURL (SOAuthorizationExtras)
@@ -33,5 +31,3 @@
+ (BOOL)_web_canPerformAuthorizationWithURL:(NSURL *)url;
@end
-
-#endif
Modified: trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationNSURLExtras.mm (246526 => 246527)
--- trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationNSURLExtras.mm 2019-06-18 00:17:24 UTC (rev 246526)
+++ trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationNSURLExtras.mm 2019-06-18 00:26:23 UTC (rev 246527)
@@ -26,8 +26,6 @@
#import "config.h"
#import "SOAuthorizationNSURLExtras.h"
-#if HAVE(APP_SSO)
-
#import <pal/cocoa/AppSSOSoftLink.h>
@implementation NSURL (SOAuthorizationExtras)
@@ -34,9 +32,11 @@
+ (BOOL)_web_canPerformAuthorizationWithURL:(NSURL *)url
{
+#if HAVE(APP_SSO)
return [PAL::getSOAuthorizationClass() canPerformAuthorizationWithURL:url responseCode:0];
+#else
+ return false;
+#endif
}
@end
-
-#endif
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (246526 => 246527)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2019-06-18 00:17:24 UTC (rev 246526)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2019-06-18 00:26:23 UTC (rev 246527)
@@ -1037,6 +1037,7 @@
572FD44322265CE200A1ECC3 /* WebViewDidMoveToWindowObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 572FD44122265CE200A1ECC3 /* WebViewDidMoveToWindowObserver.h */; };
57597EB921811D9A0037F924 /* CtapHidDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 57597EB721811D9A0037F924 /* CtapHidDriver.h */; };
57597EBD218184900037F924 /* CtapHidAuthenticator.h in Headers */ = {isa = PBXBuildFile; fileRef = 57597EBB2181848F0037F924 /* CtapHidAuthenticator.h */; };
+ 576CA9D722B862180030143C /* SOAuthorizationNSURLExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 57FD317322B35148008D0E8B /* SOAuthorizationNSURLExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
5772F206217DBD6A0056BF2C /* HidService.h in Headers */ = {isa = PBXBuildFile; fileRef = 5772F204217DBD6A0056BF2C /* HidService.h */; };
578DC2982155A0020074E815 /* LocalAuthenticationSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 578DC2972155A0010074E815 /* LocalAuthenticationSoftLink.h */; };
57AC8F50217FEED90055438C /* HidConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 57AC8F4E217FEED90055438C /* HidConnection.h */; };
@@ -1063,7 +1064,6 @@
57FD318122B3515B008D0E8B /* PopUpSOAuthorizationSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 57FD317022B35148008D0E8B /* PopUpSOAuthorizationSession.h */; };
57FD318222B3515E008D0E8B /* RedirectSOAuthorizationSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 57FD317422B35149008D0E8B /* RedirectSOAuthorizationSession.h */; };
57FD318322B35162008D0E8B /* SOAuthorizationCoordinator.h in Headers */ = {isa = PBXBuildFile; fileRef = 57FD317222B35148008D0E8B /* SOAuthorizationCoordinator.h */; };
- 57FD318422B35165008D0E8B /* SOAuthorizationNSURLExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 57FD317322B35148008D0E8B /* SOAuthorizationNSURLExtras.h */; };
57FD318522B35169008D0E8B /* SOAuthorizationSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 57FD317C22B3514A008D0E8B /* SOAuthorizationSession.h */; };
57FD318622B3516C008D0E8B /* SubFrameSOAuthorizationSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 57FD317D22B3514A008D0E8B /* SubFrameSOAuthorizationSession.h */; };
57FD318722B35170008D0E8B /* WKSOAuthorizationDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 57FD317122B35148008D0E8B /* WKSOAuthorizationDelegate.h */; };
@@ -9636,11 +9636,11 @@
83F9644E1FA0F76E00C47750 /* SharedStringHashTableReadOnly.h in Headers */,
1D67B339212E1F6100FAA786 /* ShareSheetCallbackID.h in Headers */,
7A41E9FB21F81DAD00B88CDB /* ShouldGrandfatherStatistics.h in Headers */,
+ 576CA9D722B862180030143C /* SOAuthorizationNSURLExtras.h in Headers */,
995226D6207D184600F78420 /* SimulatedInputDispatcher.h in Headers */,
2DAF06D618BD1A470081CEB1 /* SmartMagnificationController.h in Headers */,
2DE6943E18BD2A68005C15E5 /* SmartMagnificationControllerMessages.h in Headers */,
57FD318322B35162008D0E8B /* SOAuthorizationCoordinator.h in Headers */,
- 57FD318422B35165008D0E8B /* SOAuthorizationNSURLExtras.h in Headers */,
57FD318522B35169008D0E8B /* SOAuthorizationSession.h in Headers */,
5272B28B1406985D0096A5D0 /* StatisticsData.h in Headers */,
514BDED316C98EDD00E4E25E /* StatisticsRequest.h in Headers */,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
