Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1722)

Unified Diff: Source/modules/credentialmanager/CredentialsContainer.cpp

Issue 783423003: Make ScriptPromiseResolver RefCountedWillBeRefCountedGarbageCollected. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/credentialmanager/CredentialsContainer.cpp
diff --git a/Source/modules/credentialmanager/CredentialsContainer.cpp b/Source/modules/credentialmanager/CredentialsContainer.cpp
index 4cb6c87e9374bfdc4326287ce3e7b0481922608d..bd551d094f36a3ae38ab87acd0676f58f393311a 100644
--- a/Source/modules/credentialmanager/CredentialsContainer.cpp
+++ b/Source/modules/credentialmanager/CredentialsContainer.cpp
@@ -25,7 +25,7 @@
namespace blink {
-static void rejectDueToCredentialManagerError(PassRefPtr<ScriptPromiseResolver> resolver, WebCredentialManagerError* reason)
+static void rejectDueToCredentialManagerError(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver, WebCredentialManagerError* reason)
{
switch (reason->errorType) {
case WebCredentialManagerError::ErrorTypeDisabled:
@@ -41,7 +41,7 @@ static void rejectDueToCredentialManagerError(PassRefPtr<ScriptPromiseResolver>
class NotificationCallbacks : public WebCredentialManagerClient::NotificationCallbacks {
WTF_MAKE_NONCOPYABLE(NotificationCallbacks);
public:
- explicit NotificationCallbacks(PassRefPtr<ScriptPromiseResolver> resolver) : m_resolver(resolver) { }
+ explicit NotificationCallbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver) : m_resolver(resolver) { }
virtual ~NotificationCallbacks() { }
virtual void onSuccess() override
@@ -55,13 +55,13 @@ public:
}
private:
- const RefPtr<ScriptPromiseResolver> m_resolver;
+ const RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
};
class RequestCallbacks : public WebCredentialManagerClient::RequestCallbacks {
WTF_MAKE_NONCOPYABLE(RequestCallbacks);
public:
- explicit RequestCallbacks(PassRefPtr<ScriptPromiseResolver> resolver) : m_resolver(resolver) { }
+ explicit RequestCallbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver) : m_resolver(resolver) { }
virtual ~RequestCallbacks() { }
virtual void onSuccess(WebCredential* credential) override
@@ -84,7 +84,7 @@ public:
}
private:
- const RefPtr<ScriptPromiseResolver> m_resolver;
+ const RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
};
@@ -97,7 +97,7 @@ CredentialsContainer::CredentialsContainer()
{
}
-static bool checkBoilerplate(PassRefPtr<ScriptPromiseResolver> resolver)
+static bool checkBoilerplate(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
{
CredentialManagerClient* client = CredentialManagerClient::from(resolver->scriptState()->executionContext());
if (!client) {
@@ -117,7 +117,7 @@ static bool checkBoilerplate(PassRefPtr<ScriptPromiseResolver> resolver)
ScriptPromise CredentialsContainer::request(ScriptState* scriptState, const Dictionary&)
{
- RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
+ RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
ScriptPromise promise = resolver->promise();
if (!checkBoilerplate(resolver))
return promise;
@@ -129,7 +129,7 @@ ScriptPromise CredentialsContainer::request(ScriptState* scriptState, const Dict
ScriptPromise CredentialsContainer::notifySignedIn(ScriptState* scriptState, Credential* credential)
{
- RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
+ RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
ScriptPromise promise = resolver->promise();
if (!checkBoilerplate(resolver))
return promise;
@@ -140,7 +140,7 @@ ScriptPromise CredentialsContainer::notifySignedIn(ScriptState* scriptState, Cre
ScriptPromise CredentialsContainer::notifyFailedSignIn(ScriptState* scriptState, Credential* credential)
{
- RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
+ RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
ScriptPromise promise = resolver->promise();
if (!checkBoilerplate(resolver))
return promise;
@@ -151,7 +151,7 @@ ScriptPromise CredentialsContainer::notifyFailedSignIn(ScriptState* scriptState,
ScriptPromise CredentialsContainer::notifySignedOut(ScriptState* scriptState)
{
- RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
+ RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
ScriptPromise promise = resolver->promise();
if (!checkBoilerplate(resolver))
return promise;

Powered by Google App Engine
This is Rietveld 408576698