Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: be50ae5aa7002e64742a0816fbfd0f2457dab635
https://github.com/WebKit/WebKit/commit/be50ae5aa7002e64742a0816fbfd0f2457dab635
Author: Marcos Caceres <[email protected]>
Date: 2026-05-25 (Mon, 25 May 2026)
Changed paths:
M Source/WebCore/Modules/identity/CredentialRequestCoordinator.cpp
M Source/WebCore/Modules/identity/CredentialRequestCoordinator.h
M Source/WebCore/Modules/identity/CredentialRequestCoordinatorClient.h
M Source/WebCore/Modules/identity/DigitalCredential.cpp
M
Source/WebCore/Modules/identity/dummy/DummyCredentialRequestCoordinatorClient.cpp
M
Source/WebCore/Modules/identity/dummy/DummyCredentialRequestCoordinatorClient.h
M Source/WebCore/loader/EmptyClients.cpp
M Source/WebCore/page/Chrome.cpp
M Source/WebCore/page/Chrome.h
M Source/WebCore/page/ChromeClient.h
M Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
M Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h
M Source/WebKit/UIProcess/PageClient.h
M Source/WebKit/UIProcess/WebPageProxy.cpp
M Source/WebKit/UIProcess/WebPageProxy.h
M Source/WebKit/UIProcess/WebPageProxy.messages.in
M Source/WebKit/UIProcess/ios/PageClientImplIOS.h
M Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
M Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
M Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
M Source/WebKit/UIProcess/mac/PageClientImplMac.h
M Source/WebKit/UIProcess/mac/PageClientImplMac.mm
M Source/WebKit/UIProcess/mac/WebViewImpl.h
M Source/WebKit/UIProcess/mac/WebViewImpl.mm
M
Source/WebKit/WebProcess/DigitalCredentials/DigitalCredentialsCoordinator.cpp
M
Source/WebKit/WebProcess/DigitalCredentials/DigitalCredentialsCoordinator.h
M Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
M Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h
M Source/WebKit/WebProcess/WebPage/WebPage.cpp
M Source/WebKit/WebProcess/WebPage/WebPage.h
Log Message:
-----------
Digital Credentials: align CredentialRequestCoordinator method names with
spec algorithm names
https://bugs.webkit.org/show_bug.cgi?id=313737
rdar://176128667
Reviewed by Abrar Rahman Protyasha.
Rename methods, enums, and state machine terminology to match the
Digital Credentials API spec algorithm names, and align method
boundaries with the spec algorithms. This makes it trivial to
cross-reference between spec and implementation.
Renames:
- PickerState → InteractionState (idle/requesting/aborting)
- prepareCredentialRequest → prepareCredentialRequests
- abortPicker → abortTheCredentialRequest
- dismissPickerAndSettle → settleTheCredentialRequest
- showDigitalCredentialsPicker → showDigitalCredentialsChooser
- dismissDigitalCredentialsPicker → dismissDigitalCredentialsChooser
Restructures the prepareCredentialRequests/initiateTheCredentialRequest
boundary to match the spec algorithms in §6.6 "Initiate the credential
request":
- prepareCredentialRequests now does only spec §6.2 (validation, set
promise, set up abort signal), then delegates to
initiateTheCredentialRequest.
- initiateTheCredentialRequest now does the spec §6.6 chooser-display
step (build request data, call showDigitalCredentialsChooser).
- The "Queue a global task" continuation of §6.6 — for which the spec
has no separate dfn — is the new processCredentialChooserResponse
helper (which is what initiateTheCredentialRequest used to be).
Replaces "credentials picker" terminology in seven log strings (five in
CredentialRequestCoordinator.cpp and one each in WKContentViewInteraction.mm
and WebViewImpl.mm) with "credential chooser" / "credential request" to
match the rename.
Incidentally fixes a use-after-move in the build-failure path of
prepareCredentialRequests: the rejection was previously dispatched on
the local promise after it had been moved into m_currentPromise, so the
rejection was effectively a no-op. The new structure rejects via
currentPromise() instead.
The ObjC API surface (WKDigitalCredentialsPicker class, delegate, ivars)
will be renamed in a follow-up: bug 314866.
No behavioral changes for the happy path.
* Source/WebCore/Modules/identity/CredentialRequestCoordinator.cpp:
(WebCore::CredentialRequestCoordinator::InteractionStateGuard::InteractionStateGuard):
(WebCore::CredentialRequestCoordinator::InteractionStateGuard::~InteractionStateGuard):
(WebCore::CredentialRequestCoordinator::interactionState const):
(WebCore::CredentialRequestCoordinator::canTransitionTo const):
(WebCore::CredentialRequestCoordinator::setInteractionState):
(WebCore::CredentialRequestCoordinator::prepareCredentialRequests):
(WebCore::CredentialRequestCoordinator::initiateTheCredentialRequest):
(WebCore::CredentialRequestCoordinator::processCredentialChooserResponse):
(WebCore::CredentialRequestCoordinator::settleTheCredentialRequest):
(WebCore::CredentialRequestCoordinator::abortTheCredentialRequest):
(WebCore::CredentialRequestCoordinator::contextDestroyed):
(WebCore::CredentialRequestCoordinator::PickerStateGuard::PickerStateGuard):
Deleted.
(WebCore::CredentialRequestCoordinator::PickerStateGuard::~PickerStateGuard):
Deleted.
(WebCore::CredentialRequestCoordinator::currentState const): Deleted.
(WebCore::CredentialRequestCoordinator::setState): Deleted.
(WebCore::CredentialRequestCoordinator::prepareCredentialRequest): Deleted.
(WebCore::CredentialRequestCoordinator::handleDigitalCredentialsPickerResult):
Deleted.
(WebCore::CredentialRequestCoordinator::dismissPickerAndSettle): Deleted.
(WebCore::CredentialRequestCoordinator::abortPicker): Deleted.
* Source/WebCore/Modules/identity/CredentialRequestCoordinator.h:
* Source/WebCore/Modules/identity/CredentialRequestCoordinatorClient.h:
* Source/WebCore/Modules/identity/DigitalCredential.cpp:
(WebCore::DigitalCredential::discoverFromExternalSource):
*
Source/WebCore/Modules/identity/dummy/DummyCredentialRequestCoordinatorClient.cpp:
(WebCore::DummyCredentialRequestCoordinatorClient::showDigitalCredentialsChooser):
(WebCore::DummyCredentialRequestCoordinatorClient::dismissDigitalCredentialsChooser):
(WebCore::DummyCredentialRequestCoordinatorClient::showDigitalCredentialsPicker):
Deleted.
(WebCore::DummyCredentialRequestCoordinatorClient::dismissDigitalCredentialsPicker):
Deleted.
*
Source/WebCore/Modules/identity/dummy/DummyCredentialRequestCoordinatorClient.h:
* Source/WebCore/loader/EmptyClients.cpp:
* Source/WebCore/page/Chrome.cpp:
(WebCore::Chrome::showDigitalCredentialsChooser):
(WebCore::Chrome::dismissDigitalCredentialsChooser):
(WebCore::Chrome::showDigitalCredentialsPicker): Deleted.
(WebCore::Chrome::dismissDigitalCredentialsPicker): Deleted.
* Source/WebCore/page/Chrome.h:
* Source/WebCore/page/ChromeClient.h:
(WebCore::ChromeClient::showDigitalCredentialsChooser):
(WebCore::ChromeClient::dismissDigitalCredentialsChooser):
(WebCore::ChromeClient::showDigitalCredentialsPicker): Deleted.
(WebCore::ChromeClient::dismissDigitalCredentialsPicker): Deleted.
* Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _showDigitalCredentialsChooser:completionHandler:]):
(-[WKWebView _dismissDigitalCredentialsChooser:]):
(-[WKWebView _showDigitalCredentialsPicker:completionHandler:]): Deleted.
(-[WKWebView _dismissDigitalCredentialsPicker:]): Deleted.
* Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h:
* Source/WebKit/UIProcess/PageClient.h:
(WebKit::PageClient::showDigitalCredentialsChooser):
(WebKit::PageClient::dismissDigitalCredentialsChooser):
(WebKit::PageClient::showDigitalCredentialsPicker): Deleted.
(WebKit::PageClient::dismissDigitalCredentialsPicker): Deleted.
* Source/WebKit/UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::showDigitalCredentialsChooser):
(WebKit::WebPageProxy::dismissDigitalCredentialsChooser):
(WebKit::WebPageProxy::showDigitalCredentialsPicker): Deleted.
(WebKit::WebPageProxy::dismissDigitalCredentialsPicker): Deleted.
* Source/WebKit/UIProcess/WebPageProxy.h:
* Source/WebKit/UIProcess/WebPageProxy.messages.in:
* Source/WebKit/UIProcess/ios/PageClientImplIOS.h:
* Source/WebKit/UIProcess/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::showDigitalCredentialsChooser):
(WebKit::PageClientImpl::dismissDigitalCredentialsChooser):
(WebKit::PageClientImpl::showDigitalCredentialsPicker): Deleted.
(WebKit::PageClientImpl::dismissDigitalCredentialsPicker): Deleted.
* Source/WebKit/UIProcess/ios/WKContentViewInteraction.h:
* Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _showDigitalCredentialsChooser:completionHandler:]):
(-[WKContentView _dismissDigitalCredentialsChooser:]):
(-[WKContentView _showDigitalCredentialsPicker:completionHandler:]): Deleted.
(-[WKContentView _dismissDigitalCredentialsPicker:]): Deleted.
* Source/WebKit/UIProcess/mac/PageClientImplMac.h:
* Source/WebKit/UIProcess/mac/PageClientImplMac.mm:
(WebKit::PageClientImpl::showDigitalCredentialsChooser):
(WebKit::PageClientImpl::dismissDigitalCredentialsChooser):
(WebKit::PageClientImpl::showDigitalCredentialsPicker): Deleted.
(WebKit::PageClientImpl::dismissDigitalCredentialsPicker): Deleted.
* Source/WebKit/UIProcess/mac/WebViewImpl.h:
* Source/WebKit/UIProcess/mac/WebViewImpl.mm:
(WebKit::WebViewImpl::showDigitalCredentialsChooser):
(WebKit::WebViewImpl::dismissDigitalCredentialsChooser):
(WebKit::WebViewImpl::showDigitalCredentialsPicker): Deleted.
(WebKit::WebViewImpl::dismissDigitalCredentialsPicker): Deleted.
* Source/WebKit/WebProcess/DigitalCredentials/DigitalCredentialsCoordinator.cpp:
(WebKit::DigitalCredentialsCoordinator::showDigitalCredentialsChooser):
(WebKit::DigitalCredentialsCoordinator::dismissDigitalCredentialsChooser):
(WebKit::DigitalCredentialsCoordinator::showDigitalCredentialsPicker): Deleted.
(WebKit::DigitalCredentialsCoordinator::dismissDigitalCredentialsPicker):
Deleted.
* Source/WebKit/WebProcess/DigitalCredentials/DigitalCredentialsCoordinator.h:
* Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::showDigitalCredentialsChooser):
(WebKit::WebChromeClient::dismissDigitalCredentialsChooser):
(WebKit::WebChromeClient::showDigitalCredentialsPicker): Deleted.
(WebKit::WebChromeClient::dismissDigitalCredentialsPicker): Deleted.
* Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h:
* Source/WebKit/WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::showDigitalCredentialsChooser):
(WebKit::WebPage::dismissDigitalCredentialsChooser):
(WebKit::WebPage::showDigitalCredentialsPicker): Deleted.
(WebKit::WebPage::dismissDigitalCredentialsPicker): Deleted.
* Source/WebKit/WebProcess/WebPage/WebPage.h:
Canonical link: https://commits.webkit.org/313860@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
