[Digital Identity]: Digital identity API files and tests should be mo…

…ved their own modules folder https://bugs.webkit.org/show_bug.cgi?id=269166 rdar://123185171 Reviewed by Alex Christensen. Moved files related to Digital credential API to the "identity" folder. * LayoutTests/http/wpt/identity/setDigitalCredentialsEnable.https-expected.txt: Renamed from LayoutTests/http/wpt/credential-management/setDigitalCredentialsEnable.https-expected.txt. * LayoutTests/http/wpt/identity/setDigitalCredentialsEnable.https.html: Renamed from LayoutTests/http/wpt/credential-management/setDigitalCredentialsEnable.https.html. * LayoutTests/platform/glib/TestExpectations: * LayoutTests/platform/mac-wk1/TestExpectations: * Source/WebCore/CMakeLists.txt: * Source/WebCore/DerivedSources-input.xcfilelist: * Source/WebCore/DerivedSources.make: * Source/WebCore/Headers.cmake: * Source/WebCore/Modules/identity/DigitalCredential.cpp: Renamed from Source/WebCore/Modules/credentialmanagement/DigitalCredential.cpp. * Source/WebCore/Modules/identity/DigitalCredential.h: Renamed from Source/WebCore/Modules/credentialmanagement/DigitalCredential.h. * Source/WebCore/Modules/identity/DigitalCredential.idl: Renamed from Source/WebCore/Modules/credentialmanagement/DigitalCredential.idl. * Source/WebCore/Modules/identity/DigitalCredentialRequestOptions.h: Renamed from Source/WebCore/Modules/credentialmanagement/DigitalCredentialRequestOptions.h. * Source/WebCore/Modules/identity/DigitalCredentialRequestOptions.idl: Renamed from Source/WebCore/Modules/credentialmanagement/DigitalCredentialRequestOptions.idl. * Source/WebCore/Modules/identity/IdentityCredentialProtocol.h: Renamed from Source/WebCore/Modules/credentialmanagement/IdentityCredentialProtocol.h. * Source/WebCore/Modules/identity/IdentityCredentialProtocol.idl: Renamed from Source/WebCore/Modules/credentialmanagement/IdentityCredentialProtocol.idl. * Source/WebCore/Modules/identity/IdentityRequestProvider.h: Renamed from Source/WebCore/Modules/credentialmanagement/IdentityRequestProvider.h. * Source/WebCore/Modules/identity/IdentityRequestProvider.idl: Renamed from Source/WebCore/Modules/credentialmanagement/IdentityRequestProvider.idl. * Source/WebCore/Sources.txt: * Source/WebCore/WebCore.xcodeproj/project.pbxproj: Canonical link: https://commits.webkit.org/275686@main
WebKit · Mar 5, 2024 · 0fc6d0f · 0fc6d0f
1 parent ab09931
commit 0fc6d0f
Show file tree

Hide file tree

Showing 19 changed files with 32 additions and 23 deletions.
diff --git a/...gitalCredentialsEnable.https-expected.txt → ...gitalCredentialsEnable.https-expected.txt b/...gitalCredentialsEnable.https-expected.txt → ...gitalCredentialsEnable.https-expected.txt
diff --git a/...nt/setDigitalCredentialsEnable.https.html → ...ty/setDigitalCredentialsEnable.https.html b/...nt/setDigitalCredentialsEnable.https.html → ...ty/setDigitalCredentialsEnable.https.html
diff --git a/LayoutTests/platform/glib/TestExpectations b/LayoutTests/platform/glib/TestExpectations
@@ -2621,6 +2621,9 @@ http/wpt/credential-management/ [ Skip ]
 http/wpt/webauthn/ [ Skip ]
 imported/w3c/web-platform-tests/credential-management/ [ Skip ]
 
+# Digital Crendentials API
+http/wpt/identity/ [ Skip ]
+
 # WebGL2
 webkit.org/b/166536 fast/canvas/webgl/webgl-transformed-varying-name-crash.html [ Skip ]
 webkit.org/b/166536 fast/canvas/webgl/shader-mix-with-bool.html [ Skip ]

diff --git a/LayoutTests/platform/mac-wk1/TestExpectations b/LayoutTests/platform/mac-wk1/TestExpectations
@@ -1788,6 +1788,9 @@ http/wpt/credential-management/ [ Skip ]
 http/wpt/webauthn/ [ Skip ]
 imported/w3c/web-platform-tests/credential-management/ [ Skip ]
 
+# Skip Digital Credentials API
+http/wpt/identity/ [ Skip ]
+
 webkit.org/b/182554 transitions/transition-display-property.html [ Pass ImageOnlyFailure ]
 
 webkit.org/b/184456 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-in-object-fallback.html [ Pass Failure ]

diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
@@ -39,6 +39,7 @@ set(WebCore_PRIVATE_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/Modules/filesystemaccess"
     "${WEBCORE_DIR}/Modules/geolocation"
     "${WEBCORE_DIR}/Modules/highlight"
+    "${WEBCORE_DIR}/Modules/identity"
     "${WEBCORE_DIR}/Modules/indexeddb"
     "${WEBCORE_DIR}/Modules/indexeddb/client"
     "${WEBCORE_DIR}/Modules/indexeddb/server"
@@ -224,6 +225,7 @@ set(WebCore_IDL_INCLUDES
     Modules/filesystemaccess
     Modules/geolocation
     Modules/highlight
+    Modules/identity
     Modules/indexeddb
     Modules/mediacapabilities
     Modules/mediarecorder
@@ -311,10 +313,6 @@ set(WebCore_NON_SVG_IDL_FILES
     Modules/credentialmanagement/CredentialMediationRequirement.idl
     Modules/credentialmanagement/CredentialRequestOptions.idl
     Modules/credentialmanagement/CredentialsContainer.idl
-    Modules/credentialmanagement/DigitalCredential.idl
-    Modules/credentialmanagement/DigitalCredentialRequestOptions.idl
-    Modules/credentialmanagement/IdentityCredentialProtocol.idl
-    Modules/credentialmanagement/IdentityRequestProvider.idl
     Modules/credentialmanagement/Navigator+Credentials.idl
 
     Modules/encryptedmedia/MediaKeyEncryptionScheme.idl
@@ -374,6 +372,10 @@ set(WebCore_NON_SVG_IDL_FILES
     Modules/highlight/Highlight.idl
     Modules/highlight/HighlightRegistry.idl
 
+    Modules/identity/DigitalCredential.idl
+    Modules/identity/DigitalCredentialRequestOptions.idl
+    Modules/identity/IdentityCredentialProtocol.idl
+    Modules/identity/IdentityRequestProvider.idl
     Modules/identity/Navigator+Identity.idl
 
     Modules/indexeddb/IDBCursor.idl

diff --git a/Source/WebCore/DerivedSources-input.xcfilelist b/Source/WebCore/DerivedSources-input.xcfilelist
@@ -436,10 +436,6 @@ $(PROJECT_DIR)/Modules/credentialmanagement/CredentialCreationOptions.idl
 $(PROJECT_DIR)/Modules/credentialmanagement/CredentialMediationRequirement.idl
 $(PROJECT_DIR)/Modules/credentialmanagement/CredentialRequestOptions.idl
 $(PROJECT_DIR)/Modules/credentialmanagement/CredentialsContainer.idl
-$(PROJECT_DIR)/Modules/credentialmanagement/DigitalCredential.idl
-$(PROJECT_DIR)/Modules/credentialmanagement/DigitalCredentialRequestOptions.idl
-$(PROJECT_DIR)/Modules/credentialmanagement/IdentityCredentialProtocol.idl
-$(PROJECT_DIR)/Modules/credentialmanagement/IdentityRequestProvider.idl
 $(PROJECT_DIR)/Modules/credentialmanagement/Navigator+Credentials.idl
 $(PROJECT_DIR)/Modules/encryptedmedia/MediaKeyEncryptionScheme.idl
 $(PROJECT_DIR)/Modules/encryptedmedia/MediaKeyMessageEvent.idl
@@ -507,6 +503,10 @@ $(PROJECT_DIR)/Modules/geolocation/PositionErrorCallback.idl
 $(PROJECT_DIR)/Modules/geolocation/PositionOptions.idl
 $(PROJECT_DIR)/Modules/highlight/Highlight.idl
 $(PROJECT_DIR)/Modules/highlight/HighlightRegistry.idl
+$(PROJECT_DIR)/Modules/identity/DigitalCredential.idl
+$(PROJECT_DIR)/Modules/identity/DigitalCredentialRequestOptions.idl
+$(PROJECT_DIR)/Modules/identity/IdentityCredentialProtocol.idl
+$(PROJECT_DIR)/Modules/identity/IdentityRequestProvider.idl
 $(PROJECT_DIR)/Modules/identity/Navigator+Identity.idl
 $(PROJECT_DIR)/Modules/indexeddb/IDBCursor.idl
 $(PROJECT_DIR)/Modules/indexeddb/IDBCursorDirection.idl

diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make
@@ -309,10 +309,6 @@ JS_BINDING_IDLS := \
     $(WebCore)/Modules/credentialmanagement/CredentialMediationRequirement.idl \
     $(WebCore)/Modules/credentialmanagement/CredentialRequestOptions.idl \
     $(WebCore)/Modules/credentialmanagement/CredentialsContainer.idl \
-    $(WebCore)/Modules/credentialmanagement/DigitalCredential.idl \
-    $(WebCore)/Modules/credentialmanagement/DigitalCredentialRequestOptions.idl \
-    $(WebCore)/Modules/credentialmanagement/IdentityRequestProvider.idl \
-    $(WebCore)/Modules/credentialmanagement/IdentityCredentialProtocol.idl \
     $(WebCore)/Modules/credentialmanagement/Navigator+Credentials.idl \
     $(WebCore)/Modules/encryptedmedia/MediaKeyEncryptionScheme.idl \
     $(WebCore)/Modules/encryptedmedia/MediaKeyMessageEventInit.idl \
@@ -377,6 +373,10 @@ JS_BINDING_IDLS := \
     $(WebCore)/Modules/geolocation/PositionOptions.idl \
     $(WebCore)/Modules/highlight/HighlightRegistry.idl \
     $(WebCore)/Modules/highlight/Highlight.idl \
+    $(WebCore)/Modules/identity/DigitalCredential.idl \
+    $(WebCore)/Modules/identity/DigitalCredentialRequestOptions.idl \
+    $(WebCore)/Modules/identity/IdentityRequestProvider.idl \
+    $(WebCore)/Modules/identity/IdentityCredentialProtocol.idl \
     $(WebCore)/Modules/identity/Navigator+Identity.idl \
     $(WebCore)/Modules/indexeddb/IDBCursor.idl \
     $(WebCore)/Modules/indexeddb/IDBCursorDirection.idl \

diff --git a/Source/WebCore/Headers.cmake b/Source/WebCore/Headers.cmake
@@ -343,7 +343,6 @@ set(WebCore_PRIVATE_FRAMEWORK_HEADERS
     Modules/cookie-store/CookieStoreGetOptions.h
 
     Modules/credentialmanagement/CredentialRequestOptions.h
-    Modules/credentialmanagement/DigitalCredentialRequestOptions.h
 
     Modules/encryptedmedia/CDMClient.h
     Modules/encryptedmedia/MediaKeySystemClient.h
@@ -393,6 +392,8 @@ set(WebCore_PRIVATE_FRAMEWORK_HEADERS
     Modules/highlight/HighlightRegistry.h
     Modules/highlight/HighlightVisibility.h
 
+    Modules/identity/DigitalCredentialRequestOptions.h
+
     Modules/indexeddb/IDBActiveDOMObject.h
     Modules/indexeddb/IDBDatabaseIdentifier.h
     Modules/indexeddb/IDBDatabaseNameAndVersionRequest.h

diff --git a/...redentialmanagement/DigitalCredential.cpp → ...re/Modules/identity/DigitalCredential.cpp b/...redentialmanagement/DigitalCredential.cpp → ...re/Modules/identity/DigitalCredential.cpp
diff --git a/.../credentialmanagement/DigitalCredential.h → ...Core/Modules/identity/DigitalCredential.h b/.../credentialmanagement/DigitalCredential.h → ...Core/Modules/identity/DigitalCredential.h
diff --git a/...redentialmanagement/DigitalCredential.idl → ...re/Modules/identity/DigitalCredential.idl b/...redentialmanagement/DigitalCredential.idl → ...re/Modules/identity/DigitalCredential.idl
diff --git a/...agement/DigitalCredentialRequestOptions.h → ...dentity/DigitalCredentialRequestOptions.h b/...agement/DigitalCredentialRequestOptions.h → ...dentity/DigitalCredentialRequestOptions.h
diff --git a/...ement/DigitalCredentialRequestOptions.idl → ...ntity/DigitalCredentialRequestOptions.idl b/...ement/DigitalCredentialRequestOptions.idl → ...ntity/DigitalCredentialRequestOptions.idl
diff --git a/...almanagement/IdentityCredentialProtocol.h → ...les/identity/IdentityCredentialProtocol.h b/...almanagement/IdentityCredentialProtocol.h → ...les/identity/IdentityCredentialProtocol.h
diff --git a/...management/IdentityCredentialProtocol.idl → ...s/identity/IdentityCredentialProtocol.idl b/...management/IdentityCredentialProtocol.idl → ...s/identity/IdentityCredentialProtocol.idl
diff --git a/...ntialmanagement/IdentityRequestProvider.h → ...odules/identity/IdentityRequestProvider.h b/...ntialmanagement/IdentityRequestProvider.h → ...odules/identity/IdentityRequestProvider.h
diff --git a/...ialmanagement/IdentityRequestProvider.idl → ...ules/identity/IdentityRequestProvider.idl b/...ialmanagement/IdentityRequestProvider.idl → ...ules/identity/IdentityRequestProvider.idl
diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt
@@ -113,7 +113,6 @@ Modules/cookie-store/CookieStore.cpp
 Modules/cookie-store/CookieStoreManager.cpp
 Modules/credentialmanagement/BasicCredential.cpp
 Modules/credentialmanagement/CredentialsContainer.cpp
-Modules/credentialmanagement/DigitalCredential.cpp
 Modules/credentialmanagement/NavigatorCredentials.cpp
 Modules/entriesapi/DOMFileSystem.cpp
 Modules/entriesapi/ErrorCallback.cpp
@@ -147,6 +146,7 @@ Modules/highlight/AppHighlightRangeData.cpp
 Modules/highlight/AppHighlightStorage.cpp
 Modules/highlight/HighlightRegistry.cpp
 Modules/highlight/Highlight.cpp
+Modules/identity/DigitalCredential.cpp
 Modules/identity/NavigatorIdentity.cpp
 Modules/indexeddb/IDBCursor.cpp
 Modules/indexeddb/IDBCursorWithValue.cpp

diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -21669,6 +21669,15 @@
 		0DC0AEDC2B706E5700AF1E41 /* identity */ = {
 			isa = PBXGroup;
 			children = (
+				0D494DEE2B5E0B5200B61C51 /* DigitalCredential.cpp */,
+				0D431A7C2B5A397C00864655 /* DigitalCredential.h */,
+				0D431A7E2B5A3A9700864655 /* DigitalCredential.idl */,
+				0D494DEC2B5DF3DC00B61C51 /* DigitalCredentialRequestOptions.h */,
+				0D431A802B5A3A9800864655 /* DigitalCredentialRequestOptions.idl */,
+				0D431A842B5A42AB00864655 /* IdentityCredentialProtocol.h */,
+				0D431A862B5A42AB00864655 /* IdentityCredentialProtocol.idl */,
+				0D494DED2B5DF55000B61C51 /* IdentityRequestProvider.h */,
+				0D431A7F2B5A3A9700864655 /* IdentityRequestProvider.idl */,
 				0DC0AED92B706E5700AF1E41 /* Navigator+Identity.idl */,
 				0DC0AEDA2B706E5700AF1E41 /* NavigatorIdentity.cpp */,
 				0DC0AEDB2B706E5700AF1E41 /* NavigatorIdentity.h */,
@@ -26409,15 +26418,6 @@
 				77D510181ED7159900DA4C87 /* CredentialsContainer.cpp */,
 				77D510161ED6021B00DA4C87 /* CredentialsContainer.h */,
 				57D846291FE99F6300CA3682 /* CredentialsContainer.idl */,
-				0D494DEE2B5E0B5200B61C51 /* DigitalCredential.cpp */,
-				0D431A7C2B5A397C00864655 /* DigitalCredential.h */,
-				0D431A7E2B5A3A9700864655 /* DigitalCredential.idl */,
-				0D494DEC2B5DF3DC00B61C51 /* DigitalCredentialRequestOptions.h */,
-				0D431A802B5A3A9800864655 /* DigitalCredentialRequestOptions.idl */,
-				0D431A842B5A42AB00864655 /* IdentityCredentialProtocol.h */,
-				0D431A862B5A42AB00864655 /* IdentityCredentialProtocol.idl */,
-				0D494DED2B5DF55000B61C51 /* IdentityRequestProvider.h */,
-				0D431A7F2B5A3A9700864655 /* IdentityRequestProvider.idl */,
 				525B0CB02A9F8FD100E8A94B /* MediationRequirement.h */,
 				57D846251FE895F600CA3682 /* Navigator+Credentials.idl */,
 				57D846241FE895F500CA3682 /* NavigatorCredentials.cpp */,