Source/modules/serviceworkers/ServiceWorkerContainer.cpp - Issue 783423003: Make ScriptPromiseResolver RefCountedWillBeRefCountedGarbageCollected.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/modules/serviceworkers/ServiceWorkerContainer.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

« no previous file with comments | « Source/modules/serviceworkers/ServiceWorkerClients.cpp ('k') | Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/serviceworkers/ServiceWorkerContainer.cpp

diff --git a/Source/modules/serviceworkers/ServiceWorkerContainer.cpp b/Source/modules/serviceworkers/ServiceWorkerContainer.cpp

index 5bbf765d400c68d6259cd439aba44e8680e1c863..5f00b7fc3fac272147af4b32914c0d8478bace79 100644

--- a/Source/modules/serviceworkers/ServiceWorkerContainer.cpp

+++ b/Source/modules/serviceworkers/ServiceWorkerContainer.cpp

@@ -62,7 +62,7 @@ namespace blink {

// when nullptr is given to onSuccess.

class GetRegistrationCallback : public WebServiceWorkerProvider::WebServiceWorkerGetRegistrationCallbacks {

public:

- explicit GetRegistrationCallback(PassRefPtr<ScriptPromiseResolver> resolver)

+ explicit GetRegistrationCallback(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)

: m_resolver(resolver)

, m_adapter(m_resolver) { }

virtual ~GetRegistrationCallback() { }

@@ -75,7 +75,7 @@ public:

}

virtual void onError(WebServiceWorkerError* error) override { m_adapter.onError(error); }

private:

- RefPtr<ScriptPromiseResolver> m_resolver;

+ RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;

CallbackPromiseAdapter<ServiceWorkerRegistration, ServiceWorkerError> m_adapter;

WTF_MAKE_NONCOPYABLE(GetRegistrationCallback);

};

@@ -109,7 +109,7 @@ void ServiceWorkerContainer::trace(Visitor* visitor)

ScriptPromise ServiceWorkerContainer::registerServiceWorker(ScriptState* scriptState, const String& url, const RegistrationOptions& options)

{

ASSERT(RuntimeEnabledFeatures::serviceWorkerEnabled());

- RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);

+ RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);

ScriptPromise promise = resolver->promise();

if (!m_provider) {

@@ -173,7 +173,7 @@ private:

ScriptPromise ServiceWorkerContainer::getRegistration(ScriptState* scriptState, const String& documentURL)

{

ASSERT(RuntimeEnabledFeatures::serviceWorkerEnabled());

- RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);

+ RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);

ScriptPromise promise = resolver->promise();

if (!m_provider) {