OLD | NEW |
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/request_extra_data.h" | 9 #include "content/child/request_extra_data.h" |
10 #include "content/child/service_worker/service_worker_dispatcher.h" | 10 #include "content/child/service_worker/service_worker_dispatcher.h" |
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 GetNextProviderId(), | 208 GetNextProviderId(), |
209 is_parent_frame_secure) {} | 209 is_parent_frame_secure) {} |
210 | 210 |
211 ServiceWorkerNetworkProvider::ServiceWorkerNetworkProvider( | 211 ServiceWorkerNetworkProvider::ServiceWorkerNetworkProvider( |
212 mojom::ServiceWorkerProviderClientInfoPtr info) | 212 mojom::ServiceWorkerProviderClientInfoPtr info) |
213 : provider_id_(info->provider_id) { | 213 : provider_id_(info->provider_id) { |
214 context_ = new ServiceWorkerProviderContext( | 214 context_ = new ServiceWorkerProviderContext( |
215 provider_id_, info->type, std::move(info->client_request), | 215 provider_id_, info->type, std::move(info->client_request), |
216 ChildThreadImpl::current()->thread_safe_sender()); | 216 ChildThreadImpl::current()->thread_safe_sender()); |
217 | 217 |
| 218 if (info->script_loader_factory_ptr_info.is_valid()) |
| 219 script_loader_factory_.Bind( |
| 220 std::move(info->script_loader_factory_ptr_info)); |
| 221 |
218 ServiceWorkerDispatcher* dispatcher = | 222 ServiceWorkerDispatcher* dispatcher = |
219 ServiceWorkerDispatcher::GetOrCreateThreadSpecificInstance( | 223 ServiceWorkerDispatcher::GetOrCreateThreadSpecificInstance( |
220 ChildThreadImpl::current()->thread_safe_sender(), | 224 ChildThreadImpl::current()->thread_safe_sender(), |
221 base::ThreadTaskRunnerHandle::Get().get()); | 225 base::ThreadTaskRunnerHandle::Get().get()); |
222 // TODO(shimazu): Set registration/attributes directly to |context_|. | 226 // TODO(shimazu): Set registration/attributes directly to |context_|. |
223 dispatcher->OnAssociateRegistration(-1, info->provider_id, info->registration, | 227 dispatcher->OnAssociateRegistration(-1, info->provider_id, info->registration, |
224 info->attributes); | 228 info->attributes); |
225 | 229 |
226 provider_host_.Bind(std::move(info->host_ptr_info)); | 230 provider_host_.Bind(std::move(info->host_ptr_info)); |
227 } | 231 } |
(...skipping 12 matching lines...) Expand all Loading... |
240 bool ServiceWorkerNetworkProvider::IsControlledByServiceWorker() const { | 244 bool ServiceWorkerNetworkProvider::IsControlledByServiceWorker() const { |
241 if (ServiceWorkerUtils::IsServicificationEnabled()) { | 245 if (ServiceWorkerUtils::IsServicificationEnabled()) { |
242 // Interception for subresource loading is not working (yet) | 246 // Interception for subresource loading is not working (yet) |
243 // when servicification is enabled. | 247 // when servicification is enabled. |
244 return false; | 248 return false; |
245 } | 249 } |
246 return context() && context()->controller(); | 250 return context() && context()->controller(); |
247 } | 251 } |
248 | 252 |
249 } // namespace content | 253 } // namespace content |
OLD | NEW |