Source/modules/push_messaging/PushManager.cpp - Issue 236713003: [ServiceWorker, PushMessaging] Use ScriptPromiseResolverWithContext.

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 236713003: [ServiceWorker, PushMessaging] Use ScriptPromiseResolverWithContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 8 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/bindings/v8/ScriptPromiseResolverWithContext.cpp ('k') | Source/modules/serviceworkers/ServiceWorkerContainer.cpp » ('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 1796e9246c566f2adde40392a0f008cf2f2aa671..65277fe489d7aa9fd0d8aa685c1f92786fa13c7f 100644

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

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

@@ -6,8 +6,9 @@

#include "modules/push_messaging/PushManager.h"

#include "bindings/v8/CallbackPromiseAdapter.h"

+#include "bindings/v8/NewScriptState.h"

#include "bindings/v8/ScriptPromise.h"

-#include "bindings/v8/ScriptPromiseResolver.h"

+#include "bindings/v8/ScriptPromiseResolverWithContext.h"

#include "core/dom/Document.h"

#include "core/dom/ExecutionContext.h"

#include "modules/push_messaging/PushError.h"

@@ -28,10 +29,10 @@ PushManager::~PushManager()

ScriptPromise PushManager::registerPushMessaging(ExecutionContext* context, const String& senderId)

{

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

+ RefPtr<ScriptPromiseResolverWithContext> resolver = ScriptPromiseResolverWithContext::create(NewScriptState::current(toIsolate(context)));

ScriptPromise promise = resolver->promise();

// FIXME: Implement registration.

- OwnPtr<CallbackPromiseAdapter<PushRegistration, PushError> > adapter = adoptPtr(new CallbackPromiseAdapter<PushRegistration, PushError>(resolver, context));

+ OwnPtr<CallbackPromiseAdapter<PushRegistration, PushError> > adapter = adoptPtr(new CallbackPromiseAdapter<PushRegistration, PushError>(resolver));

adapter->onError(new blink::WebPushError(blink::WebPushError::ErrorTypeAbort, "FIXME"));

return promise;

}