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/browser/service_worker/service_worker_url_request_job.h" | 5 #include "content/browser/service_worker/service_worker_url_request_job.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <limits> | 10 #include <limits> |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
191 }; | 191 }; |
192 | 192 |
193 bool ServiceWorkerURLRequestJob::Delegate::RequestStillValid( | 193 bool ServiceWorkerURLRequestJob::Delegate::RequestStillValid( |
194 ServiceWorkerMetrics::URLRequestJobResult* result) { | 194 ServiceWorkerMetrics::URLRequestJobResult* result) { |
195 return true; | 195 return true; |
196 } | 196 } |
197 | 197 |
198 ServiceWorkerURLRequestJob::ServiceWorkerURLRequestJob( | 198 ServiceWorkerURLRequestJob::ServiceWorkerURLRequestJob( |
199 net::URLRequest* request, | 199 net::URLRequest* request, |
200 net::NetworkDelegate* network_delegate, | 200 net::NetworkDelegate* network_delegate, |
201 const std::string& client_id, | 201 base::WeakPtr<ServiceWorkerProviderHost> client_provider_host, |
202 base::WeakPtr<storage::BlobStorageContext> blob_storage_context, | 202 base::WeakPtr<storage::BlobStorageContext> blob_storage_context, |
203 const ResourceContext* resource_context, | 203 const ResourceContext* resource_context, |
204 FetchRequestMode request_mode, | 204 FetchRequestMode request_mode, |
205 FetchCredentialsMode credentials_mode, | 205 FetchCredentialsMode credentials_mode, |
206 FetchRedirectMode redirect_mode, | 206 FetchRedirectMode redirect_mode, |
207 ResourceType resource_type, | 207 ResourceType resource_type, |
208 RequestContextType request_context_type, | 208 RequestContextType request_context_type, |
209 RequestContextFrameType frame_type, | 209 RequestContextFrameType frame_type, |
210 scoped_refptr<ResourceRequestBodyImpl> body, | 210 scoped_refptr<ResourceRequestBodyImpl> body, |
211 ServiceWorkerFetchType fetch_type, | 211 ServiceWorkerFetchType fetch_type, |
212 Delegate* delegate) | 212 Delegate* delegate) |
213 : net::URLRequestJob(request, network_delegate), | 213 : net::URLRequestJob(request, network_delegate), |
214 delegate_(delegate), | 214 delegate_(delegate), |
215 response_type_(NOT_DETERMINED), | 215 response_type_(NOT_DETERMINED), |
216 is_started_(false), | 216 is_started_(false), |
217 service_worker_response_type_(blink::WebServiceWorkerResponseTypeDefault), | 217 service_worker_response_type_(blink::WebServiceWorkerResponseTypeDefault), |
218 client_id_(client_id), | 218 client_provider_host_(client_provider_host), |
| 219 client_id_(client_provider_host_ ? client_provider_host_->client_uuid() |
| 220 : std::string()), |
219 blob_storage_context_(blob_storage_context), | 221 blob_storage_context_(blob_storage_context), |
220 resource_context_(resource_context), | 222 resource_context_(resource_context), |
221 request_mode_(request_mode), | 223 request_mode_(request_mode), |
222 credentials_mode_(credentials_mode), | 224 credentials_mode_(credentials_mode), |
223 redirect_mode_(redirect_mode), | 225 redirect_mode_(redirect_mode), |
224 resource_type_(resource_type), | 226 resource_type_(resource_type), |
225 request_context_type_(request_context_type), | 227 request_context_type_(request_context_type), |
226 frame_type_(frame_type), | 228 frame_type_(frame_type), |
227 fall_back_required_(false), | 229 fall_back_required_(false), |
228 body_(body), | 230 body_(body), |
(...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
886 initial_worker_status_ = active_worker->running_status(); | 888 initial_worker_status_ = active_worker->running_status(); |
887 | 889 |
888 DCHECK(!fetch_dispatcher_); | 890 DCHECK(!fetch_dispatcher_); |
889 fetch_dispatcher_.reset(new ServiceWorkerFetchDispatcher( | 891 fetch_dispatcher_.reset(new ServiceWorkerFetchDispatcher( |
890 CreateFetchRequest(), active_worker, resource_type_, request()->net_log(), | 892 CreateFetchRequest(), active_worker, resource_type_, request()->net_log(), |
891 base::Bind(&ServiceWorkerURLRequestJob::DidPrepareFetchEvent, | 893 base::Bind(&ServiceWorkerURLRequestJob::DidPrepareFetchEvent, |
892 weak_factory_.GetWeakPtr(), active_worker), | 894 weak_factory_.GetWeakPtr(), active_worker), |
893 base::Bind(&ServiceWorkerURLRequestJob::DidDispatchFetchEvent, | 895 base::Bind(&ServiceWorkerURLRequestJob::DidDispatchFetchEvent, |
894 weak_factory_.GetWeakPtr()))); | 896 weak_factory_.GetWeakPtr()))); |
895 worker_start_time_ = base::TimeTicks::Now(); | 897 worker_start_time_ = base::TimeTicks::Now(); |
896 fetch_dispatcher_->MaybeStartNavigationPreload(request()); | 898 fetch_dispatcher_->MaybeStartNavigationPreload(request(), |
| 899 client_provider_host_); |
897 fetch_dispatcher_->Run(); | 900 fetch_dispatcher_->Run(); |
898 } | 901 } |
899 | 902 |
900 } // namespace content | 903 } // namespace content |
OLD | NEW |