Changeset 285736 in webkit

Timestamp:

Nov 12, 2021, 12:15:39 PM (5 years ago)

Author:

Brent Fulgham

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.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm (modified) (5 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-11-12  Brent Fulgham  <bfulgham@apple.com>
+
+        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  <pvollan@apple.com>
 

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

@@ -36 +36 @@
 #import <WebCore/AuthenticatorAttachment.h>
 #import <WebCore/AuthenticatorResponseData.h>
+#import <WebCore/BufferSource.h>
 #import <WebCore/ExceptionData.h>
 #import <WebCore/PublicKeyCredentialCreationOptions.h>
@@ -48 +49 @@
 {
     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()]);
 }
 
@@ -147 +143 @@
     }
 
-    return adoptNS([allocASCPublicKeyCredentialDescriptorInstance() initWithCredentialID:toNSData(descriptor.id).get() transports:transports.get()]);
+    return adoptNS([allocASCPublicKeyCredentialDescriptorInstance() initWithCredentialID:WebCore::toNSData(descriptor.id).get() transports:transports.get()]);
 }
 
@@ -174 +170 @@
     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()];
@@ -232 +228 @@
     [requestContext setRelyingPartyIdentifier:options.rpId];
 
-    auto challenge = toNSData(options.challenge);
+    auto challenge = WebCore::toNSData(options.challenge);
 
     if (requestTypes & ASCCredentialRequestTypePlatformPublicKeyAssertion)