Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(671)

Side by Side Diff: content/child/service_worker/service_worker_network_provider.cc

Issue 1257553002: [Proof-of-concept] PlzNavigate and Service Worker Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Pass navigation_provider_id 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/child/service_worker/service_worker_network_provider.h" 5 #include "content/child/service_worker/service_worker_network_provider.h"
6 6
7 #include "base/atomic_sequence_num.h" 7 #include "base/atomic_sequence_num.h"
8 #include "content/child/child_thread_impl.h" 8 #include "content/child/child_thread_impl.h"
9 #include "content/child/service_worker/service_worker_provider_context.h" 9 #include "content/child/service_worker/service_worker_provider_context.h"
10 #include "content/common/service_worker/service_worker_messages.h" 10 #include "content/common/service_worker/service_worker_messages.h"
(...skipping 28 matching lines...) Expand all
39 } 39 }
40 40
41 ServiceWorkerNetworkProvider* ServiceWorkerNetworkProvider::FromDocumentState( 41 ServiceWorkerNetworkProvider* ServiceWorkerNetworkProvider::FromDocumentState(
42 base::SupportsUserData* datasource_userdata) { 42 base::SupportsUserData* datasource_userdata) {
43 return static_cast<ServiceWorkerNetworkProvider*>( 43 return static_cast<ServiceWorkerNetworkProvider*>(
44 datasource_userdata->GetUserData(&kUserDataKey)); 44 datasource_userdata->GetUserData(&kUserDataKey));
45 } 45 }
46 46
47 ServiceWorkerNetworkProvider::ServiceWorkerNetworkProvider( 47 ServiceWorkerNetworkProvider::ServiceWorkerNetworkProvider(
48 int route_id, 48 int route_id,
49 ServiceWorkerProviderType provider_type) 49 ServiceWorkerProviderType provider_type,
50 int navigation_provider_id)
50 : provider_id_(GenerateProviderIdForType(provider_type)) { 51 : provider_id_(GenerateProviderIdForType(provider_type)) {
51 if (provider_id_ == kInvalidServiceWorkerProviderId) 52 if (provider_id_ == kInvalidServiceWorkerProviderId)
52 return; 53 return;
53 context_ = new ServiceWorkerProviderContext(provider_id_); 54 context_ = new ServiceWorkerProviderContext(provider_id_);
54 if (!ChildThreadImpl::current()) 55 if (!ChildThreadImpl::current())
55 return; // May be null in some tests. 56 return; // May be null in some tests.
57 // PlzNavigate:
56 ChildThreadImpl::current()->Send(new ServiceWorkerHostMsg_ProviderCreated( 58 ChildThreadImpl::current()->Send(new ServiceWorkerHostMsg_ProviderCreated(
57 provider_id_, route_id, provider_type)); 59 provider_id_, route_id, provider_type, navigation_provider_id));
58 } 60 }
59 61
62 ServiceWorkerNetworkProvider::ServiceWorkerNetworkProvider(
63 int route_id,
64 ServiceWorkerProviderType provider_type)
65 : ServiceWorkerNetworkProvider(route_id,
66 provider_type,
67 kInvalidServiceWorkerProviderId) {}
68
60 ServiceWorkerNetworkProvider::~ServiceWorkerNetworkProvider() { 69 ServiceWorkerNetworkProvider::~ServiceWorkerNetworkProvider() {
61 if (provider_id_ == kInvalidServiceWorkerProviderId) 70 if (provider_id_ == kInvalidServiceWorkerProviderId)
62 return; 71 return;
63 if (!ChildThreadImpl::current()) 72 if (!ChildThreadImpl::current())
64 return; // May be null in some tests. 73 return; // May be null in some tests.
65 ChildThreadImpl::current()->Send( 74 ChildThreadImpl::current()->Send(
66 new ServiceWorkerHostMsg_ProviderDestroyed(provider_id_)); 75 new ServiceWorkerHostMsg_ProviderDestroyed(provider_id_));
67 } 76 }
68 77
69 void ServiceWorkerNetworkProvider::SetServiceWorkerVersionId( 78 void ServiceWorkerNetworkProvider::SetServiceWorkerVersionId(
70 int64 version_id) { 79 int64 version_id) {
71 DCHECK_NE(kInvalidServiceWorkerProviderId, provider_id_); 80 DCHECK_NE(kInvalidServiceWorkerProviderId, provider_id_);
72 if (!ChildThreadImpl::current()) 81 if (!ChildThreadImpl::current())
73 return; // May be null in some tests. 82 return; // May be null in some tests.
74 ChildThreadImpl::current()->Send( 83 ChildThreadImpl::current()->Send(
75 new ServiceWorkerHostMsg_SetVersionId(provider_id_, version_id)); 84 new ServiceWorkerHostMsg_SetVersionId(provider_id_, version_id));
76 } 85 }
77 86
78 } // namespace content 87 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698