| 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 <map> | 10 #include <map> |
| (...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 548 if (resource_type_ != RESOURCE_TYPE_MAIN_FRAME) | 548 if (resource_type_ != RESOURCE_TYPE_MAIN_FRAME) |
| 549 return; | 549 return; |
| 550 if (!worker_already_activated_) | 550 if (!worker_already_activated_) |
| 551 return; | 551 return; |
| 552 if (version->skip_recording_startup_time() && | 552 if (version->skip_recording_startup_time() && |
| 553 initial_worker_status_ != EmbeddedWorkerStatus::RUNNING) { | 553 initial_worker_status_ != EmbeddedWorkerStatus::RUNNING) { |
| 554 return; | 554 return; |
| 555 } | 555 } |
| 556 if (version->should_exclude_from_uma()) | 556 if (version->should_exclude_from_uma()) |
| 557 return; | 557 return; |
| 558 ServiceWorkerMetrics::RecordActivatedWorkerPreparationTimeForMainFrame( | 558 ServiceWorkerMetrics::RecordActivatedWorkerPreparationForMainFrame( |
| 559 worker_ready_time_ - request()->creation_time(), initial_worker_status_, | 559 worker_ready_time_ - request()->creation_time(), initial_worker_status_, |
| 560 version->embedded_worker()->start_situation()); | 560 version->embedded_worker()->start_situation(), did_navigation_preload_); |
| 561 } | 561 } |
| 562 | 562 |
| 563 void ServiceWorkerURLRequestJob::DidDispatchFetchEvent( | 563 void ServiceWorkerURLRequestJob::DidDispatchFetchEvent( |
| 564 ServiceWorkerStatusCode status, | 564 ServiceWorkerStatusCode status, |
| 565 ServiceWorkerFetchEventResult fetch_result, | 565 ServiceWorkerFetchEventResult fetch_result, |
| 566 const ServiceWorkerResponse& response, | 566 const ServiceWorkerResponse& response, |
| 567 const scoped_refptr<ServiceWorkerVersion>& version) { | 567 const scoped_refptr<ServiceWorkerVersion>& version) { |
| 568 fetch_dispatcher_.reset(); | 568 fetch_dispatcher_.reset(); |
| 569 ServiceWorkerMetrics::RecordFetchEventStatus(IsMainResourceLoad(), status); | 569 ServiceWorkerMetrics::RecordFetchEventStatus(IsMainResourceLoad(), status); |
| 570 | 570 |
| (...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 872 | 872 |
| 873 DCHECK(!fetch_dispatcher_); | 873 DCHECK(!fetch_dispatcher_); |
| 874 fetch_dispatcher_.reset(new ServiceWorkerFetchDispatcher( | 874 fetch_dispatcher_.reset(new ServiceWorkerFetchDispatcher( |
| 875 CreateFetchRequest(), active_worker, resource_type_, timeout_, | 875 CreateFetchRequest(), active_worker, resource_type_, timeout_, |
| 876 request()->net_log(), | 876 request()->net_log(), |
| 877 base::Bind(&ServiceWorkerURLRequestJob::DidPrepareFetchEvent, | 877 base::Bind(&ServiceWorkerURLRequestJob::DidPrepareFetchEvent, |
| 878 weak_factory_.GetWeakPtr(), active_worker), | 878 weak_factory_.GetWeakPtr(), active_worker), |
| 879 base::Bind(&ServiceWorkerURLRequestJob::DidDispatchFetchEvent, | 879 base::Bind(&ServiceWorkerURLRequestJob::DidDispatchFetchEvent, |
| 880 weak_factory_.GetWeakPtr()))); | 880 weak_factory_.GetWeakPtr()))); |
| 881 worker_start_time_ = base::TimeTicks::Now(); | 881 worker_start_time_ = base::TimeTicks::Now(); |
| 882 fetch_dispatcher_->MaybeStartNavigationPreload(request()); | 882 did_navigation_preload_ = |
| 883 fetch_dispatcher_->MaybeStartNavigationPreload(request()); |
| 883 fetch_dispatcher_->Run(); | 884 fetch_dispatcher_->Run(); |
| 884 } | 885 } |
| 885 | 886 |
| 886 } // namespace content | 887 } // namespace content |
| OLD | NEW |