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_controllee_request_handl er.h" | 5 #include "content/browser/service_worker/service_worker_controllee_request_handl er.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
11 #include "content/browser/service_worker/service_worker_context_core.h" | 11 #include "content/browser/service_worker/service_worker_context_core.h" |
12 #include "content/browser/service_worker/service_worker_metrics.h" | 12 #include "content/browser/service_worker/service_worker_metrics.h" |
13 #include "content/browser/service_worker/service_worker_provider_host.h" | 13 #include "content/browser/service_worker/service_worker_provider_host.h" |
14 #include "content/browser/service_worker/service_worker_registration.h" | 14 #include "content/browser/service_worker/service_worker_registration.h" |
15 #include "content/browser/service_worker/service_worker_response_info.h" | 15 #include "content/browser/service_worker/service_worker_response_info.h" |
16 #include "content/browser/service_worker/service_worker_url_request_job.h" | 16 #include "content/browser/service_worker/service_worker_url_request_job.h" |
17 #include "content/common/resource_request_body.h" | 17 #include "content/common/resource_request_body.h" |
18 #include "content/common/service_worker/service_worker_types.h" | 18 #include "content/common/service_worker/service_worker_types.h" |
19 #include "content/common/service_worker/service_worker_utils.h" | 19 #include "content/common/service_worker/service_worker_utils.h" |
20 #include "content/public/browser/content_browser_client.h" | 20 #include "content/public/browser/content_browser_client.h" |
21 #include "content/public/common/content_client.h" | 21 #include "content/public/common/content_client.h" |
22 #include "content/public/common/resource_response_info.h" | 22 #include "content/public/common/resource_response_info.h" |
23 #include "net/base/load_flags.h" | 23 #include "net/base/load_flags.h" |
24 #include "net/base/url_util.h" | 24 #include "net/base/url_util.h" |
25 #include "net/url_request/url_request.h" | 25 #include "net/url_request/url_request.h" |
26 | 26 |
27 namespace content { | 27 namespace content { |
28 | 28 |
29 namespace { | |
30 | |
31 void MaybeForwardToServiceWorker(ServiceWorkerURLRequestJob* job, | |
32 ServiceWorkerVersion* version) { | |
33 DCHECK(job); | |
34 DCHECK(version); | |
35 if (version->has_fetch_handler()) | |
36 job->ForwardToServiceWorker(); | |
37 else | |
38 job->FallbackToNetwork(); | |
39 } | |
40 | |
41 } // namespace | |
42 | |
29 ServiceWorkerControlleeRequestHandler::ServiceWorkerControlleeRequestHandler( | 43 ServiceWorkerControlleeRequestHandler::ServiceWorkerControlleeRequestHandler( |
30 base::WeakPtr<ServiceWorkerContextCore> context, | 44 base::WeakPtr<ServiceWorkerContextCore> context, |
31 base::WeakPtr<ServiceWorkerProviderHost> provider_host, | 45 base::WeakPtr<ServiceWorkerProviderHost> provider_host, |
32 base::WeakPtr<storage::BlobStorageContext> blob_storage_context, | 46 base::WeakPtr<storage::BlobStorageContext> blob_storage_context, |
33 FetchRequestMode request_mode, | 47 FetchRequestMode request_mode, |
34 FetchCredentialsMode credentials_mode, | 48 FetchCredentialsMode credentials_mode, |
35 FetchRedirectMode redirect_mode, | 49 FetchRedirectMode redirect_mode, |
36 ResourceType resource_type, | 50 ResourceType resource_type, |
37 RequestContextType request_context_type, | 51 RequestContextType request_context_type, |
38 RequestContextFrameType frame_type, | 52 RequestContextFrameType frame_type, |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
244 "ServiceWorker", | 258 "ServiceWorker", |
245 "ServiceWorkerControlleeRequestHandler::PrepareForMainResource", | 259 "ServiceWorkerControlleeRequestHandler::PrepareForMainResource", |
246 job_.get(), | 260 job_.get(), |
247 "Status", status, | 261 "Status", status, |
248 "Info", | 262 "Info", |
249 "ServiceWorkerVersion is not available, so falling back to network"); | 263 "ServiceWorkerVersion is not available, so falling back to network"); |
250 return; | 264 return; |
251 } | 265 } |
252 | 266 |
253 ServiceWorkerMetrics::CountControlledPageLoad(stripped_url_); | 267 ServiceWorkerMetrics::CountControlledPageLoad(stripped_url_); |
268 MaybeForwardToServiceWorker(job_.get(), active_version.get()); | |
254 | 269 |
255 job_->ForwardToServiceWorker(); | |
256 TRACE_EVENT_ASYNC_END2( | 270 TRACE_EVENT_ASYNC_END2( |
257 "ServiceWorker", | 271 "ServiceWorker", |
258 "ServiceWorkerControlleeRequestHandler::PrepareForMainResource", | 272 "ServiceWorkerControlleeRequestHandler::PrepareForMainResource", |
259 job_.get(), | 273 job_.get(), |
260 "Status", status, | 274 "Status", status, |
261 "Info", | 275 "Info", |
262 "Forwarded to the ServiceWorker"); | 276 "Forwarded to the ServiceWorker"); |
falken
2016/05/30 06:11:29
nit: can you update this trace to say whether it w
shimazu
2016/05/30 09:45:33
Done.
| |
263 } | 277 } |
264 | 278 |
265 void ServiceWorkerControlleeRequestHandler::OnVersionStatusChanged( | 279 void ServiceWorkerControlleeRequestHandler::OnVersionStatusChanged( |
266 ServiceWorkerRegistration* registration, | 280 ServiceWorkerRegistration* registration, |
267 ServiceWorkerVersion* version) { | 281 ServiceWorkerVersion* version) { |
268 // The job may have been canceled and then destroyed before this was invoked. | 282 // The job may have been canceled and then destroyed before this was invoked. |
269 if (!job_) | 283 if (!job_) |
270 return; | 284 return; |
271 | 285 |
272 if (provider_host_) | 286 if (provider_host_) |
273 provider_host_->SetAllowAssociation(true); | 287 provider_host_->SetAllowAssociation(true); |
274 if (version != registration->active_version() || | 288 if (version != registration->active_version() || |
275 version->status() != ServiceWorkerVersion::ACTIVATED || | 289 version->status() != ServiceWorkerVersion::ACTIVATED || |
276 !provider_host_) { | 290 !provider_host_) { |
277 job_->FallbackToNetwork(); | 291 job_->FallbackToNetwork(); |
278 return; | 292 return; |
279 } | 293 } |
280 | 294 |
281 ServiceWorkerMetrics::CountControlledPageLoad(stripped_url_); | 295 ServiceWorkerMetrics::CountControlledPageLoad(stripped_url_); |
282 | 296 |
283 provider_host_->AssociateRegistration(registration, | 297 provider_host_->AssociateRegistration(registration, |
284 false /* notify_controllerchange */); | 298 false /* notify_controllerchange */); |
285 job_->ForwardToServiceWorker(); | 299 |
300 MaybeForwardToServiceWorker(job_.get(), version); | |
286 } | 301 } |
287 | 302 |
288 void ServiceWorkerControlleeRequestHandler::DidUpdateRegistration( | 303 void ServiceWorkerControlleeRequestHandler::DidUpdateRegistration( |
289 const scoped_refptr<ServiceWorkerRegistration>& original_registration, | 304 const scoped_refptr<ServiceWorkerRegistration>& original_registration, |
290 ServiceWorkerStatusCode status, | 305 ServiceWorkerStatusCode status, |
291 const std::string& status_message, | 306 const std::string& status_message, |
292 int64_t registration_id) { | 307 int64_t registration_id) { |
293 DCHECK(force_update_started_); | 308 DCHECK(force_update_started_); |
294 | 309 |
295 // The job may have been canceled and then destroyed before this was invoked. | 310 // The job may have been canceled and then destroyed before this was invoked. |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
345 } | 360 } |
346 version->RegisterStatusChangeCallback( | 361 version->RegisterStatusChangeCallback( |
347 base::Bind(&self::OnUpdatedVersionStatusChanged, | 362 base::Bind(&self::OnUpdatedVersionStatusChanged, |
348 weak_factory_.GetWeakPtr(), registration, version)); | 363 weak_factory_.GetWeakPtr(), registration, version)); |
349 } | 364 } |
350 | 365 |
351 void ServiceWorkerControlleeRequestHandler::PrepareForSubResource() { | 366 void ServiceWorkerControlleeRequestHandler::PrepareForSubResource() { |
352 DCHECK(job_.get()); | 367 DCHECK(job_.get()); |
353 DCHECK(context_); | 368 DCHECK(context_); |
354 DCHECK(provider_host_->active_version()); | 369 DCHECK(provider_host_->active_version()); |
355 job_->ForwardToServiceWorker(); | 370 MaybeForwardToServiceWorker(job_.get(), provider_host_->active_version()); |
356 } | 371 } |
357 | 372 |
358 void ServiceWorkerControlleeRequestHandler::OnPrepareToRestart() { | 373 void ServiceWorkerControlleeRequestHandler::OnPrepareToRestart() { |
359 use_network_ = true; | 374 use_network_ = true; |
360 ClearJob(); | 375 ClearJob(); |
361 } | 376 } |
362 | 377 |
363 ServiceWorkerVersion* | 378 ServiceWorkerVersion* |
364 ServiceWorkerControlleeRequestHandler::GetServiceWorkerVersion( | 379 ServiceWorkerControlleeRequestHandler::GetServiceWorkerVersion( |
365 ServiceWorkerMetrics::URLRequestJobResult* result) { | 380 ServiceWorkerMetrics::URLRequestJobResult* result) { |
(...skipping 23 matching lines...) Expand all Loading... | |
389 DCHECK(provider_host_); | 404 DCHECK(provider_host_); |
390 // Detach the controller so subresource requests also skip the worker. | 405 // Detach the controller so subresource requests also skip the worker. |
391 provider_host_->NotifyControllerLost(); | 406 provider_host_->NotifyControllerLost(); |
392 } | 407 } |
393 | 408 |
394 void ServiceWorkerControlleeRequestHandler::ClearJob() { | 409 void ServiceWorkerControlleeRequestHandler::ClearJob() { |
395 job_.reset(); | 410 job_.reset(); |
396 } | 411 } |
397 | 412 |
398 } // namespace content | 413 } // namespace content |
OLD | NEW |