Skip to content

Commit

Permalink
Identity credentials: IdentityRequestOptions was renamed DigitalCrede…
Browse files Browse the repository at this point in the history 
…ntialRequestOptions

https://bugs.webkit.org/show_bug.cgi?id=268135
rdar://problem/121636291

Reviewed by Chris Dumez and Aditya Keerthi.

Renames IdentityRequestOptions to DigitalCredentialRequestOptions throughout.

* Source/WebCore/CMakeLists.txt:
* Source/WebCore/DerivedSources-input.xcfilelist:
* Source/WebCore/DerivedSources-output.xcfilelist:
* Source/WebCore/DerivedSources.make:
* Source/WebCore/Modules/credentialmanagement/CredentialsContainer.cpp:
(WebCore::CredentialsContainer::requestIdentity):
* Source/WebCore/Modules/credentialmanagement/CredentialsContainer.h:
* Source/WebCore/Modules/credentialmanagement/CredentialsContainer.idl:
* Source/WebCore/Modules/credentialmanagement/DigitalCredentialRequestOptions.h: Renamed from Source/WebCore/Modules/credentialmanagement/IdentityRequestOptions.h.
* Source/WebCore/Modules/credentialmanagement/DigitalCredentialRequestOptions.idl: Renamed from Source/WebCore/Modules/credentialmanagement/IdentityRequestOptions.idl.
* Source/WebCore/Sources.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:

Canonical link: https://commits.webkit.org/273596@main
  • Loading branch information
@marcoscaceres
marcoscaceres committed Jan 27, 2024
1 parent d686b02 commit f306712
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Source/WebCore/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,8 @@ set(WebCore_NON_SVG_IDL_FILES
Modules/credentialmanagement/CredentialRequestOptions.idl
Modules/credentialmanagement/CredentialsContainer.idl
Modules/credentialmanagement/DigitalCredential.idl
Modules/credentialmanagement/DigitalCredentialRequestOptions.idl
Modules/credentialmanagement/IdentityCredentialProtocol.idl
Modules/credentialmanagement/IdentityRequestOptions.idl
Modules/credentialmanagement/IdentityRequestProvider.idl
Modules/credentialmanagement/Navigator+Credentials.idl

Expand Down
2 changes: 1 addition & 1 deletion Source/WebCore/DerivedSources-input.xcfilelist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,8 +434,8 @@ $(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/IdentityRequestOptions.idl
$(PROJECT_DIR)/Modules/credentialmanagement/IdentityRequestProvider.idl
$(PROJECT_DIR)/Modules/credentialmanagement/Navigator+Credentials.idl
$(PROJECT_DIR)/Modules/encryptedmedia/MediaKeyEncryptionScheme.idl
Expand Down
4 changes: 2 additions & 2 deletions Source/WebCore/DerivedSources-output.xcfilelist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -833,6 +833,8 @@ $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDeviceOrientationOrMotionPermissi
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDeviceOrientationOrMotionPermissionState.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDigitalCredential.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDigitalCredential.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDigitalCredentialRequestOptions.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDigitalCredentialRequestOptions.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDistanceModelType.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDistanceModelType.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDocument+CSSOMView.cpp
Expand Down Expand Up @@ -1639,8 +1641,6 @@ $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSIIRFilterOptions.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSIIRFilterOptions.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSIdentityCredentialProtocol.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSIdentityCredentialProtocol.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSIdentityRequestOptions.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSIdentityRequestOptions.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSIdentityRequestProvider.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSIdentityRequestProvider.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSIdleDeadline.cpp
Expand Down
2 changes: 1 addition & 1 deletion Source/WebCore/DerivedSources.make
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ JS_BINDING_IDLS := \
$(WebCore)/Modules/credentialmanagement/CredentialRequestOptions.idl \
$(WebCore)/Modules/credentialmanagement/CredentialsContainer.idl \
$(WebCore)/Modules/credentialmanagement/DigitalCredential.idl \
$(WebCore)/Modules/credentialmanagement/IdentityRequestOptions.idl \
$(WebCore)/Modules/credentialmanagement/DigitalCredentialRequestOptions.idl \
$(WebCore)/Modules/credentialmanagement/IdentityRequestProvider.idl \
$(WebCore)/Modules/credentialmanagement/IdentityCredentialProtocol.idl \
$(WebCore)/Modules/credentialmanagement/Navigator+Credentials.idl \
Expand Down
4 changes: 2 additions & 2 deletions Source/WebCore/Modules/credentialmanagement/CredentialsContainer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
#include "CredentialCreationOptions.h"
#include "CredentialRequestOptions.h"
#include "DigitalCredential.h"
#include "DigitalCredentialRequestOptions.h"
#include "Document.h"
#include "ExceptionOr.h"
#include "IdentityRequestOptions.h"
#include "JSDOMPromiseDeferred.h"
#include "JSDigitalCredential.h"
#include "Page.h"
Expand Down Expand Up @@ -144,7 +144,7 @@ void CredentialsContainer::preventSilentAccess(DOMPromiseDeferred<void>&& promis
promise.resolve();
}

void CredentialsContainer::requestIdentity(IdentityRequestOptions&& options, DigitalCredentialPromise&& promise)
void CredentialsContainer::requestIdentity(DigitalCredentialRequestOptions&& options, DigitalCredentialPromise&& promise)
{
if (options.signal && options.signal->aborted()) {
promise.reject(Exception { ExceptionCode::AbortError, "Aborted by AbortSignal."_s });
Expand Down
4 changes: 2 additions & 2 deletions Source/WebCore/Modules/credentialmanagement/CredentialsContainer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class Document;
class WeakPtrImplWithEventTargetData;
struct CredentialCreationOptions;
struct CredentialRequestOptions;
struct IdentityRequestOptions;
struct DigitalCredentialRequestOptions;

class CredentialsContainer : public RefCounted<CredentialsContainer> {
public:
Expand All @@ -58,7 +58,7 @@ class CredentialsContainer : public RefCounted<CredentialsContainer> {

void preventSilentAccess(DOMPromiseDeferred<void>&&) const;

void requestIdentity(IdentityRequestOptions&&, DigitalCredentialPromise&&);
void requestIdentity(DigitalCredentialRequestOptions&&, DigitalCredentialPromise&&);

private:
CredentialsContainer(WeakPtr<Document, WeakPtrImplWithEventTargetData>&&);
Expand Down
2 changes: 1 addition & 1 deletion Source/WebCore/Modules/credentialmanagement/CredentialsContainer.idl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@
Promise<BasicCredential> store(BasicCredential credential);
Promise<BasicCredential?> create(optional CredentialCreationOptions options);
Promise<undefined> preventSilentAccess();
[EnabledBySetting=DigitalCredentialsEnabled] Promise<DigitalCredential> requestIdentity(IdentityRequestOptions options);
[EnabledBySetting=DigitalCredentialsEnabled] Promise<DigitalCredential> requestIdentity(DigitalCredentialRequestOptions options);
};
2 changes: 1 addition & 1 deletion ...entialmanagement/IdentityRequestOptions.h → ...agement/DigitalCredentialRequestOptions.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace WebCore {

struct IdentityRequestProvider;

struct IdentityRequestOptions {
struct DigitalCredentialRequestOptions {
RefPtr<AbortSignal> signal;
Vector<IdentityRequestProvider> providers;
};
Expand Down
2 changes: 1 addition & 1 deletion ...tialmanagement/IdentityRequestOptions.idl → ...ement/DigitalCredentialRequestOptions.idl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/

dictionary IdentityRequestOptions {
dictionary DigitalCredentialRequestOptions {
AbortSignal signal;
required sequence<IdentityRequestProvider> providers;
};
2 changes: 1 addition & 1 deletion Source/WebCore/Sources.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3443,6 +3443,7 @@ JSDeviceMotionEvent.cpp
JSDeviceOrientationEvent.cpp
JSDeviceOrientationOrMotionPermissionState.cpp
JSDigitalCredential.cpp
JSDigitalCredentialRequestOptions.cpp
JSDistanceModelType.cpp
JSDocument.cpp
JSDocumentAndElementEventHandlers.cpp
Expand Down Expand Up @@ -3792,7 +3793,6 @@ JSIDBTransactionDurability.cpp
JSIDBTransactionMode.cpp
JSIDBVersionChangeEvent.cpp
JSIdentityCredentialProtocol.cpp
JSIdentityRequestOptions.cpp
JSIdentityRequestProvider.cpp
JSIdleDeadline.cpp
JSIdleRequestCallback.cpp
Expand Down
8 changes: 4 additions & 4 deletions Source/WebCore/WebCore.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7066,11 +7066,11 @@
0C45342610CDBBFA00869157 /* JSWebGLUniformLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGLUniformLocation.h; sourceTree = "<group>"; };
0D431A7C2B5A397C00864655 /* DigitalCredential.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DigitalCredential.h; sourceTree = "<group>"; };
0D431A7E2B5A3A9700864655 /* DigitalCredential.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DigitalCredential.idl; sourceTree = "<group>"; };
0D494DEC2B5DF3DC00B61C51 /* DigitalCredentialRequestOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DigitalCredentialRequestOptions.h; sourceTree = "<group>"; };
0D431A802B5A3A9800864655 /* DigitalCredentialRequestOptions.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DigitalCredentialRequestOptions.idl; sourceTree = "<group>"; };
0D431A7F2B5A3A9700864655 /* IdentityRequestProvider.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IdentityRequestProvider.idl; sourceTree = "<group>"; };
0D431A802B5A3A9800864655 /* IdentityRequestOptions.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IdentityRequestOptions.idl; sourceTree = "<group>"; };
0D431A842B5A42AB00864655 /* IdentityCredentialProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IdentityCredentialProtocol.h; sourceTree = "<group>"; };
0D431A862B5A42AB00864655 /* IdentityCredentialProtocol.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = IdentityCredentialProtocol.idl; sourceTree = "<group>"; };
0D494DEC2B5DF3DC00B61C51 /* IdentityRequestOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IdentityRequestOptions.h; sourceTree = "<group>"; };
0D494DED2B5DF55000B61C51 /* IdentityRequestProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IdentityRequestProvider.h; sourceTree = "<group>"; };
0D494DEE2B5E0B5200B61C51 /* DigitalCredential.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DigitalCredential.cpp; sourceTree = "<group>"; };
0D84C2F328E6935C0059F63D /* NavigatorUserActivation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigatorUserActivation.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -26205,10 +26205,10 @@
0D494DEE2B5E0B5200B61C51 /* DigitalCredential.cpp */,
0D431A7C2B5A397C00864655 /* DigitalCredential.h */,
0D431A7E2B5A3A9700864655 /* DigitalCredential.idl */,
0D494DEC2B5DF3DC00B61C51 /* DigitalCredentialRequestOptions.h */,
0D431A802B5A3A9800864655 /* DigitalCredentialRequestOptions.idl */,
0D431A842B5A42AB00864655 /* IdentityCredentialProtocol.h */,
0D431A862B5A42AB00864655 /* IdentityCredentialProtocol.idl */,
0D494DEC2B5DF3DC00B61C51 /* IdentityRequestOptions.h */,
0D431A802B5A3A9800864655 /* IdentityRequestOptions.idl */,
0D494DED2B5DF55000B61C51 /* IdentityRequestProvider.h */,
0D431A7F2B5A3A9700864655 /* IdentityRequestProvider.idl */,
525B0CB02A9F8FD100E8A94B /* MediationRequirement.h */,
Expand Down

0 comments on commit f306712

Please sign in to comment.