Title: [285736] trunk/Source/WebKit
- Revision
- 285736
- Author
- [email protected]
- Date
- 2021-11-12 12:15:39 -0800 (Fri, 12 Nov 2021)
Log Message
REGRESSION (r285698): Build correction after refactoring id handling
https://bugs.webkit.org/show_bug.cgi?id=233052
<rdar://problem/85347865>
Reviewed by Chris Dumez.
Build fix after r285698. The new 'toNSData' method needs its namespace included.
* UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm:
(WebKit::toASCDescriptor):
(WebKit::configureRegistrationRequestContext):
(WebKit::configurationAssertionRequestContext):
(WebKit::toNSData): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (285735 => 285736)
--- trunk/Source/WebKit/ChangeLog 2021-11-12 20:09:11 UTC (rev 285735)
+++ trunk/Source/WebKit/ChangeLog 2021-11-12 20:15:39 UTC (rev 285736)
@@ -1,3 +1,19 @@
+2021-11-12 Brent Fulgham <[email protected]>
+
+ REGRESSION (r285698): Build correction after refactoring id handling
+ https://bugs.webkit.org/show_bug.cgi?id=233052
+ <rdar://problem/85347865>
+
+ Reviewed by Chris Dumez.
+
+ Build fix after r285698. The new 'toNSData' method needs its namespace included.
+
+ * UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm:
+ (WebKit::toASCDescriptor):
+ (WebKit::configureRegistrationRequestContext):
+ (WebKit::configurationAssertionRequestContext):
+ (WebKit::toNSData): Deleted.
+
2021-11-12 Per Arne <[email protected]>
[macOS][GPUP] Block access to mach register
Modified: trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm (285735 => 285736)
--- trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm 2021-11-12 20:09:11 UTC (rev 285735)
+++ trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm 2021-11-12 20:15:39 UTC (rev 285736)
@@ -35,6 +35,7 @@
#import <AuthenticationServices/ASCOSEConstants.h>
#import <WebCore/AuthenticatorAttachment.h>
#import <WebCore/AuthenticatorResponseData.h>
+#import <WebCore/BufferSource.h>
#import <WebCore/ExceptionData.h>
#import <WebCore/PublicKeyCredentialCreationOptions.h>
#import <wtf/BlockPtr.h>
@@ -49,11 +50,6 @@
return ArrayBuffer::create(reinterpret_cast<const uint8_t*>(data.bytes), data.length);
}
-static inline RetainPtr<NSData> toNSData(const Vector<uint8_t> vector)
-{
- return adoptNS([[NSData alloc] initWithBytes:vector.data() length:vector.size()]);
-}
-
static inline RetainPtr<NSString> toNSString(UserVerificationRequirement userVerificationRequirement)
{
switch (userVerificationRequirement) {
@@ -146,7 +142,7 @@
}
}
- return adoptNS([allocASCPublicKeyCredentialDescriptorInstance() initWithCredentialID:toNSData(descriptor.id).get() transports:transports.get()]);
+ return adoptNS([allocASCPublicKeyCredentialDescriptorInstance() initWithCredentialID:WebCore::toNSData(descriptor.id).get() transports:transports.get()]);
}
static RetainPtr<ASCCredentialRequestContext> configureRegistrationRequestContext(const PublicKeyCredentialCreationOptions& options)
@@ -173,10 +169,10 @@
auto credentialCreationOptions = adoptNS([allocASCPublicKeyCredentialCreationOptionsInstance() init]);
- [credentialCreationOptions setChallenge:toNSData(options.challenge).get()];
+ [credentialCreationOptions setChallenge:WebCore::toNSData(options.challenge).get()];
[credentialCreationOptions setRelyingPartyIdentifier:options.rp.id];
[credentialCreationOptions setUserName:options.user.name];
- [credentialCreationOptions setUserIdentifier:toNSData(options.user.id.data()).get()];
+ [credentialCreationOptions setUserIdentifier:WebCore::toNSData(options.user.id).get()];
[credentialCreationOptions setUserDisplayName:options.user.displayName];
[credentialCreationOptions setUserVerificationPreference:userVerification.get()];
[credentialCreationOptions setShouldRequireResidentKey:shouldRequireResidentKey];
@@ -231,7 +227,7 @@
auto requestContext = adoptNS([allocASCCredentialRequestContextInstance() initWithRequestTypes:requestTypes]);
[requestContext setRelyingPartyIdentifier:options.rpId];
- auto challenge = toNSData(options.challenge);
+ auto challenge = WebCore::toNSData(options.challenge);
if (requestTypes & ASCCredentialRequestTypePlatformPublicKeyAssertion)
[requestContext setPlatformKeyCredentialAssertionOptions:[allocASCPublicKeyCredentialAssertionOptionsInstance() initWithKind:ASCPublicKeyCredentialKindPlatform relyingPartyIdentifier:options.rpId challenge:challenge.get() userVerificationPreference:userVerification.get() allowedCredentials:allowedCredentials.get()]];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
