content/renderer/service_worker/service_worker_context_client.cc - Issue 1221643014: Service Worker: Migrate to version_uuid and surface ServiceWorker.id. (Chromium 2/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: content/renderer/service_worker/service_worker_context_client.cc

Issue 1221643014: Service Worker: Migrate to version_uuid and surface ServiceWorker.id. (Chromium 2/3) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 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 | « content/renderer/service_worker/service_worker_context_client.h ('k') | content/renderer/shared_worker/embedded_shared_worker_stub.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/service_worker/service_worker_context_client.cc

diff --git a/content/renderer/service_worker/service_worker_context_client.cc b/content/renderer/service_worker/service_worker_context_client.cc

index 93edf9847eca5c96a45939f8004dace04551a531..74cef9bdf980930d98d9da6bf9c19e11acfbf4e8 100644

--- a/content/renderer/service_worker/service_worker_context_client.cc

+++ b/content/renderer/service_worker/service_worker_context_client.cc

@@ -209,12 +209,12 @@ ServiceWorkerContextClient::ThreadSpecificInstance() {

ServiceWorkerContextClient::ServiceWorkerContextClient(

int embedded_worker_id,

- int64 service_worker_version_id,

+ std::string service_worker_version_uuid,

const GURL& service_worker_scope,

const GURL& script_url,

int worker_devtools_agent_route_id)

: embedded_worker_id_(embedded_worker_id),

- service_worker_version_id_(service_worker_version_id),

+ service_worker_version_uuid_(service_worker_version_uuid),

service_worker_scope_(service_worker_scope),

script_url_(script_url),

worker_devtools_agent_route_id_(worker_devtools_agent_route_id),

@@ -545,7 +545,7 @@ ServiceWorkerContextClient::createServiceWorkerNetworkProvider(

provider_context_ = provider->context();

// Tell the network provider about which version to load.

- provider->SetServiceWorkerVersionId(service_worker_version_id_);

+ provider->SetServiceWorkerVersionId(service_worker_version_uuid_);

// The provider is kept around for the lifetime of the DataSource

// and ownership is transferred to the DataSource.