Index: content/browser/service_worker/service_worker_controllee_request_handler.cc |
diff --git a/content/browser/service_worker/service_worker_controllee_request_handler.cc b/content/browser/service_worker/service_worker_controllee_request_handler.cc |
index 2ef8b6fa823ceb1d09b7560f006321453480e732..1f383d73ee5a8b89ffef2d00cfc045b34ea29e4c 100644 |
--- a/content/browser/service_worker/service_worker_controllee_request_handler.cc |
+++ b/content/browser/service_worker/service_worker_controllee_request_handler.cc |
@@ -15,6 +15,7 @@ |
#include "content/common/service_worker/service_worker_types.h" |
#include "content/public/browser/content_browser_client.h" |
#include "content/public/common/content_client.h" |
+#include "content/public/common/resource_response_info.h" |
#include "net/base/load_flags.h" |
#include "net/base/net_util.h" |
#include "net/url_request/url_request.h" |
@@ -65,8 +66,9 @@ net::URLRequestJob* ServiceWorkerControlleeRequestHandler::MaybeCreateJob( |
net::NetworkDelegate* network_delegate, |
ResourceContext* resource_context) { |
if (job_.get() && worker_start_time_.is_null()) { |
- // Save worker-start time of the first job. |
+ // Save worker timings of the first job. |
worker_start_time_ = job_->worker_start_time(); |
+ worker_ready_time_ = job_->worker_ready_time(); |
} |
if (!context_ || !provider_host_) { |
@@ -115,25 +117,20 @@ net::URLRequestJob* ServiceWorkerControlleeRequestHandler::MaybeCreateJob( |
} |
void ServiceWorkerControlleeRequestHandler::GetExtraResponseInfo( |
- bool* was_fetched_via_service_worker, |
- bool* was_fallback_required_by_service_worker, |
- GURL* original_url_via_service_worker, |
- blink::WebServiceWorkerResponseType* response_type_via_service_worker, |
- base::TimeTicks* worker_start_time) const { |
+ ResourceResponseInfo* response_info) const { |
if (!job_.get()) { |
- *was_fetched_via_service_worker = false; |
- *was_fallback_required_by_service_worker = false; |
- *original_url_via_service_worker = GURL(); |
- *worker_start_time = worker_start_time_; |
+ response_info->was_fetched_via_service_worker = false; |
+ response_info->was_fallback_required_by_service_worker = false; |
+ response_info->original_url_via_service_worker = GURL(); |
+ response_info->service_worker_start_time = worker_start_time_; |
+ response_info->service_worker_ready_time = worker_ready_time_; |
return; |
} |
- job_->GetExtraResponseInfo( |
- was_fetched_via_service_worker, was_fallback_required_by_service_worker, |
- original_url_via_service_worker, response_type_via_service_worker, |
- worker_start_time); |
+ job_->GetExtraResponseInfo(response_info); |
if (!worker_start_time_.is_null()) { |
- // If we have worker start time from previous job, use it. |
- *worker_start_time = worker_start_time_; |
+ // If we have worker timings from previous job, use it. |
+ response_info->service_worker_start_time = worker_start_time_; |
+ response_info->service_worker_ready_time = worker_ready_time_; |
} |
} |