Source/modules/push_messaging/PushManager.cpp - Issue 1233173002: Have ScriptPromiseResolver on the Oilpan heap always.

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/push_messaging/PushManager.cpp

Issue 1233173002: Have ScriptPromiseResolver on the Oilpan heap always. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: fix webusb ScriptPromiseResolver usage Created 5 years, 4 months 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/presentation/PresentationRequest.cpp ('k') | Source/modules/push_messaging/PushPermissionStatusCallbacks.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/push_messaging/PushManager.cpp

diff --git a/Source/modules/push_messaging/PushManager.cpp b/Source/modules/push_messaging/PushManager.cpp

index b676e08d741bd3bb3e2d9c7c8c01ec234e593e09..a2f55f622639ce80223dcd78c00a71872590ac0c 100644

--- a/Source/modules/push_messaging/PushManager.cpp

+++ b/Source/modules/push_messaging/PushManager.cpp

@@ -55,7 +55,7 @@ ScriptPromise PushManager::subscribe(ScriptState* scriptState, const PushSubscri

if (!m_registration->active())

return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(AbortError, "Subscription failed - no active Service Worker"));

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

+ ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);

ScriptPromise promise = resolver->promise();

// The document context is the only reasonable context from which to ask the user for permission

@@ -76,7 +76,7 @@ ScriptPromise PushManager::subscribe(ScriptState* scriptState, const PushSubscri

ScriptPromise PushManager::getSubscription(ScriptState* scriptState)

{

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

+ ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);

ScriptPromise promise = resolver->promise();

pushProvider()->getSubscription(m_registration->webRegistration(), new PushSubscriptionCallbacks(resolver, m_registration));

@@ -92,7 +92,7 @@ ScriptPromise PushManager::permissionState(ScriptState* scriptState, const PushS

return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, "Document is detached from window."));

}

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

+ ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);

ScriptPromise promise = resolver->promise();

pushProvider()->getPermissionStatus(m_registration->webRegistration(), toWebPushSubscriptionOptions(options), new PushPermissionStatusCallbacks(resolver));