Source/modules/serviceworkers/ServiceWorkerClients.cpp - Issue 247263010: ServiceWorker: Wait for registration promise to resolve before changing states.

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/ServiceWorkerClients.cpp

Issue 247263010: ServiceWorker: Wait for registration promise to resolve before changing states. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: yhirano comments 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/modules/serviceworkers/ServiceWorker.cpp ('k') | Source/modules/serviceworkers/ServiceWorkerContainer.cpp » ('j') | public/platform/WebServiceWorker.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/serviceworkers/ServiceWorkerClients.cpp

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

index a63a3d51c672c5fa2de747499869fb8847021f8c..2e3afb970d8cff5137d08dc7e7479bc36032bc68 100644

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

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

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

#include "modules/serviceworkers/ServiceWorkerClients.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 "modules/serviceworkers/Client.h"

@@ -24,7 +22,7 @@ namespace {

class ClientArray {

public:

typedef blink::WebServiceWorkerClientsInfo WebType;

- static Vector<RefPtr<Client> > from(NewScriptState*, WebType* webClientsRaw)

+ static Vector<RefPtr<Client> > from(ScriptPromiseResolverWithContext*, WebType* webClientsRaw)

{

OwnPtr<WebType> webClients = adoptPtr(webClientsRaw);

Vector<RefPtr<Client> > clients;