Source/modules/serviceworkers/ServiceWorkerClients.cpp - Issue 1240763002: CallbackPromiseAdapter types should be more compatible with WebCallbacks (3/3).

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 1240763002: CallbackPromiseAdapter types should be more compatible with WebCallbacks (3/3). (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: rebase 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/push_messaging/PushSubscriptionCallbacks.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/serviceworkers/ServiceWorkerClients.cpp

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

index e5cdcaad4dfe65eaf5192e8182ca5951c3abbd6f..089fb97dc51c8b2ba66e3cd8ffed1272190bad86 100644

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

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

@@ -16,7 +16,6 @@

#include "modules/serviceworkers/ServiceWorkerWindowClient.h"

#include "public/platform/WebServiceWorkerClientQueryOptions.h"

#include "public/platform/WebServiceWorkerClientsInfo.h"

-#include "wtf/OwnPtr.h"

#include "wtf/PassOwnPtr.h"

#include "wtf/RefPtr.h"

#include "wtf/Vector.h"

@@ -27,12 +26,12 @@ namespace {

class ClientArray {

public:

- using WebType = OwnPtr<WebServiceWorkerClientsInfo>;

- static HeapVector<Member<ServiceWorkerClient>> take(ScriptPromiseResolver*, PassOwnPtr<WebServiceWorkerClientsInfo> webClients)

+ using WebType = const WebServiceWorkerClientsInfo&;

+ static HeapVector<Member<ServiceWorkerClient>> take(ScriptPromiseResolver*, const WebServiceWorkerClientsInfo& webClients)

{

HeapVector<Member<ServiceWorkerClient>> clients;

- for (size_t i = 0; i < webClients->clients.size(); ++i) {

- const WebServiceWorkerClientInfo& client = webClients->clients[i];

+ for (size_t i = 0; i < webClients.clients.size(); ++i) {

+ const WebServiceWorkerClientInfo& client = webClients.clients[i];

if (client.clientType == WebServiceWorkerClientTypeWindow)

clients.append(ServiceWorkerWindowClient::create(client));

else