Index: third_party/WebKit/Source/modules/webauth/WebAuthentication.h |
diff --git a/third_party/WebKit/Source/modules/webauth/WebAuthentication.h b/third_party/WebKit/Source/modules/webauth/WebAuthentication.h |
index 0c0c2b3d6c85c69db7d8c5fe1f71f25150ec14c6..3e08e76d55b0ec804161dbd5eba412659635c714 100644 |
--- a/third_party/WebKit/Source/modules/webauth/WebAuthentication.h |
+++ b/third_party/WebKit/Source/modules/webauth/WebAuthentication.h |
@@ -9,18 +9,16 @@ |
#include "bindings/core/v8/ScriptPromise.h" |
#include "core/dom/ContextLifecycleObserver.h" |
#include "core/dom/DOMArrayBuffer.h" |
-#include "modules/webauth/AuthenticationAssertionOptions.h" |
-#include "modules/webauth/ScopedCredentialInfo.h" |
+#include "modules/webauth/MakeCredentialOptions.h" |
#include "platform/bindings/ScriptWrappable.h" |
#include "public/platform/modules/webauth/authenticator.mojom-blink.h" |
namespace blink { |
-class RelyingPartyAccount; |
-class AuthenticationAssertionOptions; |
-class ScopedCredentialOptions; |
-class ScopedCredentialParameters; |
-class ScriptPromiseResolver; |
+class LocalFrame; |
+class MakeCredentialOptions; |
+class PublicKeyCredentialRequestOptions; |
+class ScriptState; |
typedef ArrayBufferOrArrayBufferView BufferSource; |
@@ -39,35 +37,30 @@ class WebAuthentication final |
virtual ~WebAuthentication(); |
// WebAuthentication.idl |
- ScriptPromise makeCredential(ScriptState*, |
- const RelyingPartyAccount&, |
- const HeapVector<ScopedCredentialParameters>, |
- const BufferSource&, |
- ScopedCredentialOptions&); |
+ ScriptPromise makeCredential(ScriptState*, MakeCredentialOptions&); |
+ |
ScriptPromise getAssertion(ScriptState*, |
- const BufferSource&, |
- const AuthenticationAssertionOptions&); |
+ const PublicKeyCredentialRequestOptions&); |
webauth::mojom::blink::Authenticator* Authenticator() const { |
return authenticator_.get(); |
} |
+ void OnMakeCredential(ScriptPromiseResolver*, |
+ webauth::mojom::blink::AuthenticatorStatus, |
+ webauth::mojom::blink::PublicKeyCredentialInfoPtr); |
+ bool MarkRequestComplete(ScriptPromiseResolver*); |
+ |
// ContextLifecycleObserver overrides. |
void ContextDestroyed(ExecutionContext*) override; |
+ void OnAuthenticatorConnectionError(); |
+ |
DECLARE_VIRTUAL_TRACE(); |
private: |
explicit WebAuthentication(LocalFrame&); |
- void OnMakeCredential(ScriptPromiseResolver*, |
- webauth::mojom::blink::AuthenticatorStatus, |
- webauth::mojom::blink::ScopedCredentialInfoPtr); |
- ScriptPromise RejectIfNotSupported(ScriptState*); |
- void OnAuthenticatorConnectionError(); |
- bool MarkRequestComplete(ScriptPromiseResolver*); |
- void Cleanup(); |
- |
webauth::mojom::blink::AuthenticatorPtr authenticator_; |
HeapHashSet<Member<ScriptPromiseResolver>> authenticator_requests_; |
}; |