Diff
Modified: trunk/LayoutTests/ChangeLog (249107 => 249108)
--- trunk/LayoutTests/ChangeLog 2019-08-26 18:41:58 UTC (rev 249107)
+++ trunk/LayoutTests/ChangeLog 2019-08-26 18:43:09 UTC (rev 249108)
@@ -1,5 +1,16 @@
2019-08-26 Jiewen Tan <[email protected]>
+ [WebAuthn] Support HID authenticators on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=201084
+ <rdar://problem/51908390>
+
+ Reviewed by Youenn Fablet.
+
+ * platform/ios-wk2/TestExpectations:
+ Unskips HID tests for iOS.
+
+2019-08-26 Jiewen Tan <[email protected]>
+
Unreviewed, test gardening
* platform/mac-wk2/TestExpectations:
Modified: trunk/LayoutTests/platform/ios-wk2/TestExpectations (249107 => 249108)
--- trunk/LayoutTests/platform/ios-wk2/TestExpectations 2019-08-26 18:41:58 UTC (rev 249107)
+++ trunk/LayoutTests/platform/ios-wk2/TestExpectations 2019-08-26 18:43:09 UTC (rev 249108)
@@ -1287,22 +1287,6 @@
webkit.org/b/189641 [ Debug ] webgl/2.0.0/conformance/attribs/gl-vertexattribpointer.html [ Slow ]
-# Skip WebAuthN tests for hid authenticators
-http/wpt/webauthn/ctap-hid-failure.https.html [ Skip ]
-http/wpt/webauthn/ctap-hid-success.https.html [ Skip ]
-http/wpt/webauthn/public-key-credential-create-failure-hid-silent.https.html [ Skip ]
-http/wpt/webauthn/public-key-credential-create-failure-hid.https.html [ Skip ]
-http/wpt/webauthn/public-key-credential-create-success-hid.https.html [ Skip ]
-http/wpt/webauthn/public-key-credential-get-failure-hid-silent.https.html [ Skip ]
-http/wpt/webauthn/public-key-credential-get-failure-hid.https.html [ Skip ]
-http/wpt/webauthn/public-key-credential-get-success-hid.https.html [ Skip ]
-http/wpt/webauthn/public-key-credential-create-failure-u2f-silent.https.html [ Skip ]
-http/wpt/webauthn/public-key-credential-create-failure-u2f.https.html [ Skip ]
-http/wpt/webauthn/public-key-credential-create-success-u2f.https.html [ Skip ]
-http/wpt/webauthn/public-key-credential-get-failure-u2f-silent.https.html [ Skip ]
-http/wpt/webauthn/public-key-credential-get-failure-u2f.https.html [ Skip ]
-http/wpt/webauthn/public-key-credential-get-success-u2f.https.html [ Skip ]
-
# FIXME: Unskip these tests once we have the fix for <rdar://problem/44930119>.
fast/forms/auto-fill-button/caps-lock-indicator-should-be-visible-after-hiding-auto-fill-strong-password-button.html [ Skip ]
fast/forms/auto-fill-button/caps-lock-indicator-should-not-be-visible-when-auto-fill-strong-password-button-is-visible.html [ Skip ]
Modified: trunk/Source/WebCore/PAL/ChangeLog (249107 => 249108)
--- trunk/Source/WebCore/PAL/ChangeLog 2019-08-26 18:41:58 UTC (rev 249107)
+++ trunk/Source/WebCore/PAL/ChangeLog 2019-08-26 18:43:09 UTC (rev 249108)
@@ -1,3 +1,14 @@
+2019-08-26 Jiewen Tan <[email protected]>
+
+ [WebAuthn] Support HID authenticators on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=201084
+ <rdar://problem/51908390>
+
+ Reviewed by Youenn Fablet.
+
+ * pal/spi/cocoa/IOKitSPI.h:
+ Move IOHIDDevice.h and IOHIDManager.h to IOKitSPI.h given they are in iOS.
+
2019-08-22 Andy Estes <[email protected]>
[watchOS] Disable Content Filtering in the simulator build
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/IOKitSPI.h (249107 => 249108)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/IOKitSPI.h 2019-08-26 18:41:58 UTC (rev 249107)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/IOKitSPI.h 2019-08-26 18:43:09 UTC (rev 249108)
@@ -27,9 +27,11 @@
#if USE(APPLE_INTERNAL_SDK)
+#import <IOKit/hid/IOHIDDevice.h>
#import <IOKit/hid/IOHIDEvent.h>
#import <IOKit/hid/IOHIDEventData.h>
#import <IOKit/hid/IOHIDEventSystemClient.h>
+#import <IOKit/hid/IOHIDManager.h>
#import <IOKit/hid/IOHIDUsageTables.h>
#else
@@ -208,6 +210,47 @@
kHIDUsage_KeyboardRightGUI = 0xE7,
};
+typedef struct CF_BRIDGED_TYPE(id) __IOHIDDevice * IOHIDDeviceRef;
+
+typedef kern_return_t IOReturn;
+
+enum IOHIDReportType {
+ kIOHIDReportTypeInput = 0,
+ kIOHIDReportTypeOutput,
+};
+
+enum {
+ kIOHIDOptionsTypeNone = 0x00,
+};
+typedef uint32_t IOHIDOptionsType;
+
+typedef UInt32 IOOptionBits;
+
+typedef void (*IOHIDReportCallback) (void*, IOReturn, void*, IOHIDReportType, uint32_t, uint8_t*, CFIndex);
+
+IOReturn IOHIDDeviceOpen(IOHIDDeviceRef, IOOptionBits);
+void IOHIDDeviceScheduleWithRunLoop(IOHIDDeviceRef, CFRunLoopRef, CFStringRef);
+void IOHIDDeviceRegisterInputReportCallback(IOHIDDeviceRef, uint8_t*, CFIndex, IOHIDReportCallback, void*);
+void IOHIDDeviceUnscheduleFromRunLoop(IOHIDDeviceRef, CFRunLoopRef, CFStringRef);
+IOReturn IOHIDDeviceClose(IOHIDDeviceRef, IOOptionBits);
+IOReturn IOHIDDeviceSetReport(IOHIDDeviceRef, IOHIDReportType, CFIndex, const uint8_t*, CFIndex);
+
+typedef struct CF_BRIDGED_TYPE(id) __IOHIDManager * IOHIDManagerRef;
+
+#define kIOHIDPrimaryUsagePageKey "PrimaryUsagePage"
+#define kIOHIDPrimaryUsageKey "PrimaryUsage"
+
+typedef void (*IOHIDDeviceCallback) (void*, IOReturn, void*, IOHIDDeviceRef);
+
+IOHIDManagerRef IOHIDManagerCreate(CFAllocatorRef, IOOptionBits);
+void IOHIDManagerSetDeviceMatching(IOHIDManagerRef, CFDictionaryRef);
+void IOHIDManagerRegisterDeviceMatchingCallback(IOHIDManagerRef, IOHIDDeviceCallback, void*);
+void IOHIDManagerRegisterDeviceRemovalCallback(IOHIDManagerRef, IOHIDDeviceCallback, void*);
+void IOHIDManagerUnscheduleFromRunLoop(IOHIDManagerRef, CFRunLoopRef, CFStringRef);
+IOReturn IOHIDManagerClose(IOHIDManagerRef, IOOptionBits);
+void IOHIDManagerScheduleWithRunLoop(IOHIDManagerRef, CFRunLoopRef, CFStringRef);
+IOReturn IOHIDManagerOpen(IOHIDManagerRef, IOOptionBits);
+
WTF_EXTERN_C_END
#endif // USE(APPLE_INTERNAL_SDK)
Modified: trunk/Source/WebKit/ChangeLog (249107 => 249108)
--- trunk/Source/WebKit/ChangeLog 2019-08-26 18:41:58 UTC (rev 249107)
+++ trunk/Source/WebKit/ChangeLog 2019-08-26 18:43:09 UTC (rev 249108)
@@ -1,3 +1,33 @@
+2019-08-26 Jiewen Tan <[email protected]>
+
+ [WebAuthn] Support HID authenticators on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=201084
+ <rdar://problem/51908390>
+
+ Reviewed by Youenn Fablet.
+
+ This patch makes the macOS HID implementation available in iOS as well.
+ Mostly, it removes the PLATFORM(MAC) compile time flag.
+
+ * UIProcess/WebAuthentication/AuthenticatorManager.cpp:
+ (WebKit::AuthenticatorManagerInternal::collectTransports):
+ * UIProcess/WebAuthentication/AuthenticatorTransportService.cpp:
+ (WebKit::AuthenticatorTransportService::create):
+ (WebKit::AuthenticatorTransportService::createMock):
+ * UIProcess/WebAuthentication/Cocoa/HidConnection.h:
+ * UIProcess/WebAuthentication/Cocoa/HidConnection.mm:
+ * UIProcess/WebAuthentication/Cocoa/HidService.h:
+ * UIProcess/WebAuthentication/Cocoa/HidService.mm:
+ * UIProcess/WebAuthentication/Cocoa/NfcConnection.mm:
+ (WebKit::NfcConnection::NfcConnection):
+ A tentative solution before there is an official UI.
+ * UIProcess/WebAuthentication/Mock/MockHidConnection.cpp:
+ * UIProcess/WebAuthentication/Mock/MockHidConnection.h:
+ * UIProcess/WebAuthentication/Mock/MockHidService.cpp:
+ * UIProcess/WebAuthentication/Mock/MockHidService.h:
+ * UIProcess/WebAuthentication/fido/CtapHidDriver.cpp:
+ * UIProcess/WebAuthentication/fido/CtapHidDriver.h:
+
2019-08-26 Russell Epstein <[email protected]>
Unreviewed, rolling out r248961.
Modified: trunk/Source/WebKit/UIProcess/WebAuthentication/AuthenticatorManager.cpp (249107 => 249108)
--- trunk/Source/WebKit/UIProcess/WebAuthentication/AuthenticatorManager.cpp 2019-08-26 18:41:58 UTC (rev 249107)
+++ trunk/Source/WebKit/UIProcess/WebAuthentication/AuthenticatorManager.cpp 2019-08-26 18:43:09 UTC (rev 249108)
@@ -37,11 +37,7 @@
namespace AuthenticatorManagerInternal {
-#if PLATFORM(MAC)
const size_t maxTransportNumber = 3;
-#else
-const size_t maxTransportNumber = 2;
-#endif
// Suggested by WebAuthN spec as of 7 August 2018.
const unsigned maxTimeOutValue = 120000;
@@ -53,10 +49,8 @@
if (!authenticatorSelection || !authenticatorSelection->authenticatorAttachment) {
auto addResult = result.add(AuthenticatorTransport::Internal);
ASSERT_UNUSED(addResult, addResult.isNewEntry);
-#if PLATFORM(MAC)
addResult = result.add(AuthenticatorTransport::Usb);
ASSERT_UNUSED(addResult, addResult.isNewEntry);
-#endif
addResult = result.add(AuthenticatorTransport::Nfc);
ASSERT_UNUSED(addResult, addResult.isNewEntry);
return result;
@@ -68,12 +62,10 @@
return result;
}
if (authenticatorSelection->authenticatorAttachment == PublicKeyCredentialCreationOptions::AuthenticatorAttachment::CrossPlatform) {
- auto addResult = result.add(AuthenticatorTransport::Nfc);
+ auto addResult = result.add(AuthenticatorTransport::Usb);
ASSERT_UNUSED(addResult, addResult.isNewEntry);
-#if PLATFORM(MAC)
- addResult = result.add(AuthenticatorTransport::Usb);
+ addResult = result.add(AuthenticatorTransport::Nfc);
ASSERT_UNUSED(addResult, addResult.isNewEntry);
-#endif
return result;
}
@@ -92,10 +84,8 @@
if (allowCredentials.isEmpty()) {
auto addResult = result.add(AuthenticatorTransport::Internal);
ASSERT_UNUSED(addResult, addResult.isNewEntry);
-#if PLATFORM(MAC)
addResult = result.add(AuthenticatorTransport::Usb);
ASSERT_UNUSED(addResult, addResult.isNewEntry);
-#endif
addResult = result.add(AuthenticatorTransport::Nfc);
ASSERT_UNUSED(addResult, addResult.isNewEntry);
return result;
@@ -104,18 +94,14 @@
for (auto& allowCredential : allowCredentials) {
if (allowCredential.transports.isEmpty()) {
result.add(AuthenticatorTransport::Internal);
-#if PLATFORM(MAC)
result.add(AuthenticatorTransport::Usb);
-#endif
result.add(AuthenticatorTransport::Nfc);
return result;
}
if (!result.contains(AuthenticatorTransport::Internal) && allowCredential.transports.contains(AuthenticatorTransport::Internal))
result.add(AuthenticatorTransport::Internal);
-#if PLATFORM(MAC)
if (!result.contains(AuthenticatorTransport::Usb) && allowCredential.transports.contains(AuthenticatorTransport::Usb))
result.add(AuthenticatorTransport::Usb);
-#endif
if (!result.contains(AuthenticatorTransport::Nfc) && allowCredential.transports.contains(AuthenticatorTransport::Nfc))
result.add(AuthenticatorTransport::Nfc);
if (result.size() >= maxTransportNumber)
Modified: trunk/Source/WebKit/UIProcess/WebAuthentication/AuthenticatorTransportService.cpp (249107 => 249108)
--- trunk/Source/WebKit/UIProcess/WebAuthentication/AuthenticatorTransportService.cpp 2019-08-26 18:41:58 UTC (rev 249107)
+++ trunk/Source/WebKit/UIProcess/WebAuthentication/AuthenticatorTransportService.cpp 2019-08-26 18:43:09 UTC (rev 249108)
@@ -43,10 +43,8 @@
switch (transport) {
case WebCore::AuthenticatorTransport::Internal:
return makeUniqueRef<LocalService>(observer);
-#if PLATFORM(MAC)
case WebCore::AuthenticatorTransport::Usb:
return makeUniqueRef<HidService>(observer);
-#endif
case WebCore::AuthenticatorTransport::Nfc:
return makeUniqueRef<NfcService>(observer);
default:
@@ -60,10 +58,8 @@
switch (transport) {
case WebCore::AuthenticatorTransport::Internal:
return makeUniqueRef<MockLocalService>(observer, configuration);
-#if PLATFORM(MAC)
case WebCore::AuthenticatorTransport::Usb:
return makeUniqueRef<MockHidService>(observer, configuration);
-#endif
case WebCore::AuthenticatorTransport::Nfc:
return makeUniqueRef<MockNfcService>(observer, configuration);
default:
Modified: trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/HidConnection.h (249107 => 249108)
--- trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/HidConnection.h 2019-08-26 18:41:58 UTC (rev 249107)
+++ trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/HidConnection.h 2019-08-26 18:43:09 UTC (rev 249108)
@@ -25,9 +25,9 @@
#pragma once
-#if ENABLE(WEB_AUTHN) && PLATFORM(MAC)
+#if ENABLE(WEB_AUTHN)
-#include <IOKit/hid/IOHIDDevice.h>
+#include <pal/spi/cocoa/IOKitSPI.h>
#include <wtf/CompletionHandler.h>
#include <wtf/Deque.h>
#include <wtf/Forward.h>
@@ -82,4 +82,4 @@
} // namespace WebKit
-#endif // ENABLE(WEB_AUTHN) && PLATFORM(MAC)
+#endif // ENABLE(WEB_AUTHN)
Modified: trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/HidConnection.mm (249107 => 249108)
--- trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/HidConnection.mm 2019-08-26 18:41:58 UTC (rev 249107)
+++ trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/HidConnection.mm 2019-08-26 18:43:09 UTC (rev 249108)
@@ -26,7 +26,7 @@
#import "config.h"
#import "HidConnection.h"
-#if ENABLE(WEB_AUTHN) && PLATFORM(MAC)
+#if ENABLE(WEB_AUTHN)
#import <WebCore/FidoConstants.h>
#import <wtf/BlockPtr.h>
@@ -134,5 +134,5 @@
} // namespace WebKit
-#endif // ENABLE(WEB_AUTHN) && PLATFORM(MAC)
+#endif // ENABLE(WEB_AUTHN)
Modified: trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/HidService.h (249107 => 249108)
--- trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/HidService.h 2019-08-26 18:41:58 UTC (rev 249107)
+++ trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/HidService.h 2019-08-26 18:43:09 UTC (rev 249108)
@@ -25,10 +25,10 @@
#pragma once
-#if ENABLE(WEB_AUTHN) && PLATFORM(MAC)
+#if ENABLE(WEB_AUTHN)
#include "FidoService.h"
-#include <IOKit/hid/IOHIDManager.h>
+#include <pal/spi/cocoa/IOKitSPI.h>
#include <wtf/RetainPtr.h>
#include <wtf/UniqueRef.h>
@@ -55,4 +55,4 @@
} // namespace WebKit
-#endif // ENABLE(WEB_AUTHN) && PLATFORM(MAC)
+#endif // ENABLE(WEB_AUTHN)
Modified: trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/HidService.mm (249107 => 249108)
--- trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/HidService.mm 2019-08-26 18:41:58 UTC (rev 249107)
+++ trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/HidService.mm 2019-08-26 18:43:09 UTC (rev 249108)
@@ -26,7 +26,7 @@
#import "config.h"
#import "HidService.h"
-#if ENABLE(WEB_AUTHN) && PLATFORM(MAC)
+#if ENABLE(WEB_AUTHN)
#import "CtapHidDriver.h"
#import "HidConnection.h"
@@ -90,4 +90,4 @@
} // namespace WebKit
-#endif // ENABLE(WEB_AUTHN) && PLATFORM(MAC)
+#endif // ENABLE(WEB_AUTHN)
Modified: trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/NfcConnection.mm (249107 => 249108)
--- trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/NfcConnection.mm 2019-08-26 18:41:58 UTC (rev 249107)
+++ trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/NfcConnection.mm 2019-08-26 18:43:09 UTC (rev 249108)
@@ -52,7 +52,7 @@
{
[m_session setDelegate:m_delegate.get()];
// FIXME(200933)
- [m_session updateUIAlertMessage:@"Hold the key against the top of your device."];
+ [m_session updateUIAlertMessage:@"Insert your security key or hold the key against the top of your device."];
[m_session startPolling];
}
Modified: trunk/Source/WebKit/UIProcess/WebAuthentication/Mock/MockHidConnection.cpp (249107 => 249108)
--- trunk/Source/WebKit/UIProcess/WebAuthentication/Mock/MockHidConnection.cpp 2019-08-26 18:41:58 UTC (rev 249107)
+++ trunk/Source/WebKit/UIProcess/WebAuthentication/Mock/MockHidConnection.cpp 2019-08-26 18:43:09 UTC (rev 249108)
@@ -26,7 +26,7 @@
#include "config.h"
#include "MockHidConnection.h"
-#if ENABLE(WEB_AUTHN) && PLATFORM(MAC)
+#if ENABLE(WEB_AUTHN)
#include <WebCore/AuthenticatorGetInfoResponse.h>
#include <WebCore/CBORReader.h>
@@ -292,4 +292,4 @@
} // namespace WebKit
-#endif // ENABLE(WEB_AUTHN) && PLATFORM(MAC)
+#endif // ENABLE(WEB_AUTHN)
Modified: trunk/Source/WebKit/UIProcess/WebAuthentication/Mock/MockHidConnection.h (249107 => 249108)
--- trunk/Source/WebKit/UIProcess/WebAuthentication/Mock/MockHidConnection.h 2019-08-26 18:41:58 UTC (rev 249107)
+++ trunk/Source/WebKit/UIProcess/WebAuthentication/Mock/MockHidConnection.h 2019-08-26 18:43:09 UTC (rev 249108)
@@ -25,7 +25,7 @@
#pragma once
-#if ENABLE(WEB_AUTHN) && PLATFORM(MAC)
+#if ENABLE(WEB_AUTHN)
#include "HidConnection.h"
#include "MockWebAuthenticationConfiguration.h"
@@ -72,4 +72,4 @@
} // namespace WebKit
-#endif // ENABLE(WEB_AUTHN) && PLATFORM(MAC)
+#endif // ENABLE(WEB_AUTHN)
Modified: trunk/Source/WebKit/UIProcess/WebAuthentication/Mock/MockHidService.cpp (249107 => 249108)
--- trunk/Source/WebKit/UIProcess/WebAuthentication/Mock/MockHidService.cpp 2019-08-26 18:41:58 UTC (rev 249107)
+++ trunk/Source/WebKit/UIProcess/WebAuthentication/Mock/MockHidService.cpp 2019-08-26 18:43:09 UTC (rev 249108)
@@ -26,7 +26,7 @@
#include "config.h"
#include "MockHidService.h"
-#if ENABLE(WEB_AUTHN) && PLATFORM(MAC)
+#if ENABLE(WEB_AUTHN)
#include "MockHidConnection.h"
#include <wtf/RunLoop.h>
@@ -55,4 +55,4 @@
} // namespace WebKit
-#endif // ENABLE(WEB_AUTHN) && PLATFORM(MAC)
+#endif // ENABLE(WEB_AUTHN)
Modified: trunk/Source/WebKit/UIProcess/WebAuthentication/Mock/MockHidService.h (249107 => 249108)
--- trunk/Source/WebKit/UIProcess/WebAuthentication/Mock/MockHidService.h 2019-08-26 18:41:58 UTC (rev 249107)
+++ trunk/Source/WebKit/UIProcess/WebAuthentication/Mock/MockHidService.h 2019-08-26 18:43:09 UTC (rev 249108)
@@ -25,7 +25,7 @@
#pragma once
-#if ENABLE(WEB_AUTHN) && PLATFORM(MAC)
+#if ENABLE(WEB_AUTHN)
#include "HidService.h"
#include "MockWebAuthenticationConfiguration.h"
@@ -47,4 +47,4 @@
} // namespace WebKit
-#endif // ENABLE(WEB_AUTHN) && PLATFORM(MAC)
+#endif // ENABLE(WEB_AUTHN)
Modified: trunk/Source/WebKit/UIProcess/WebAuthentication/fido/CtapHidDriver.cpp (249107 => 249108)
--- trunk/Source/WebKit/UIProcess/WebAuthentication/fido/CtapHidDriver.cpp 2019-08-26 18:41:58 UTC (rev 249107)
+++ trunk/Source/WebKit/UIProcess/WebAuthentication/fido/CtapHidDriver.cpp 2019-08-26 18:43:09 UTC (rev 249108)
@@ -26,7 +26,7 @@
#include "config.h"
#include "CtapHidDriver.h"
-#if ENABLE(WEB_AUTHN) && PLATFORM(MAC)
+#if ENABLE(WEB_AUTHN)
#include <WebCore/FidoConstants.h>
#include <wtf/RandomNumber.h>
@@ -220,4 +220,4 @@
} // namespace WebKit
-#endif // ENABLE(WEB_AUTHN) && PLATFORM(MAC)
+#endif // ENABLE(WEB_AUTHN)
Modified: trunk/Source/WebKit/UIProcess/WebAuthentication/fido/CtapHidDriver.h (249107 => 249108)
--- trunk/Source/WebKit/UIProcess/WebAuthentication/fido/CtapHidDriver.h 2019-08-26 18:41:58 UTC (rev 249107)
+++ trunk/Source/WebKit/UIProcess/WebAuthentication/fido/CtapHidDriver.h 2019-08-26 18:43:09 UTC (rev 249108)
@@ -25,7 +25,7 @@
#pragma once
-#if ENABLE(WEB_AUTHN) && PLATFORM(MAC)
+#if ENABLE(WEB_AUTHN)
#include "CtapDriver.h"
#include "HidConnection.h"
@@ -99,4 +99,4 @@
} // namespace WebKit
-#endif // ENABLE(WEB_AUTHN) && PLATFORM(MAC)
+#endif // ENABLE(WEB_AUTHN)
