content/child/service_worker/service_worker_network_provider.cc - Issue 2154663002: service worker: Relax the BadMessageReceived call in OnSetHostedVersionId

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: content/child/service_worker/service_worker_network_provider.cc

Issue 2154663002: service worker: Relax the BadMessageReceived call in OnSetHostedVersionId (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: patch Created 4 years, 5 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

« content/browser/service_worker/service_worker_dispatcher_host.cc ('K') | « content/child/service_worker/service_worker_network_provider.h ('k') | content/common/service_worker/service_worker_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/child/service_worker/service_worker_network_provider.cc

diff --git a/content/child/service_worker/service_worker_network_provider.cc b/content/child/service_worker/service_worker_network_provider.cc

index 0ad0365ddcc00c94a579d24c3c190d546068f1c7..2f9be43dd5cd275c7cbaab2d017fd4581f53f582 100644

--- a/content/child/service_worker/service_worker_network_provider.cc

+++ b/content/child/service_worker/service_worker_network_provider.cc

@@ -116,12 +116,13 @@ ServiceWorkerNetworkProvider::~ServiceWorkerNetworkProvider() {

}

void ServiceWorkerNetworkProvider::SetServiceWorkerVersionId(

- int64_t version_id) {

+ int64_t version_id,

+ int embedded_worker_id) {

DCHECK_NE(kInvalidServiceWorkerProviderId, provider_id_);

if (!ChildThreadImpl::current())

return; // May be null in some tests.

- ChildThreadImpl::current()->Send(

- new ServiceWorkerHostMsg_SetVersionId(provider_id_, version_id));

+ ChildThreadImpl::current()->Send(new ServiceWorkerHostMsg_SetVersionId(

+ provider_id_, version_id, embedded_worker_id));

}

bool ServiceWorkerNetworkProvider::IsControlledByServiceWorker() const {