| Index: content/browser/service_worker/service_worker_url_request_job.cc
|
| diff --git a/content/browser/service_worker/service_worker_url_request_job.cc b/content/browser/service_worker/service_worker_url_request_job.cc
|
| index c96d47d31a0d18511de2e514c54654c3e4ade42c..8babae1dc31e0ecd31196f228460b2fdf4ca272b 100644
|
| --- a/content/browser/service_worker/service_worker_url_request_job.cc
|
| +++ b/content/browser/service_worker/service_worker_url_request_job.cc
|
| @@ -296,9 +296,7 @@ void ServiceWorkerURLRequestJob::GetExtraResponseInfo(
|
| bool* was_fallback_required_by_service_worker,
|
| GURL* original_url_via_service_worker,
|
| blink::WebServiceWorkerResponseType* response_type_via_service_worker,
|
| - base::TimeTicks* fetch_start_time,
|
| - base::TimeTicks* fetch_ready_time,
|
| - base::TimeTicks* fetch_end_time) const {
|
| + base::TimeTicks* worker_start_time) const {
|
| if (response_type_ != FORWARD_TO_SERVICE_WORKER) {
|
| *was_fetched_via_service_worker = false;
|
| *was_fallback_required_by_service_worker = false;
|
| @@ -311,9 +309,7 @@ void ServiceWorkerURLRequestJob::GetExtraResponseInfo(
|
| *was_fallback_required_by_service_worker = fall_back_required_;
|
| *original_url_via_service_worker = response_url_;
|
| *response_type_via_service_worker = service_worker_response_type_;
|
| - *fetch_start_time = fetch_start_time_;
|
| - *fetch_ready_time = fetch_ready_time_;
|
| - *fetch_end_time = fetch_end_time_;
|
| + *worker_start_time = worker_start_time_;
|
| }
|
|
|
|
|
| @@ -356,7 +352,7 @@ void ServiceWorkerURLRequestJob::StartRequest() {
|
| weak_factory_.GetWeakPtr()),
|
| base::Bind(&ServiceWorkerURLRequestJob::DidDispatchFetchEvent,
|
| weak_factory_.GetWeakPtr())));
|
| - fetch_start_time_ = base::TimeTicks::Now();
|
| + worker_start_time_ = base::TimeTicks::Now();
|
| fetch_dispatcher_->Run();
|
| return;
|
| }
|
| @@ -472,8 +468,7 @@ bool ServiceWorkerURLRequestJob::CreateRequestBodyBlob(std::string* blob_uuid,
|
| }
|
|
|
| void ServiceWorkerURLRequestJob::DidPrepareFetchEvent() {
|
| - fetch_ready_time_ = base::TimeTicks::Now();
|
| - load_timing_info_.send_start = fetch_ready_time_;
|
| + load_timing_info_.send_start = base::TimeTicks::Now();
|
| }
|
|
|
| void ServiceWorkerURLRequestJob::DidDispatchFetchEvent(
|
| @@ -528,8 +523,7 @@ void ServiceWorkerURLRequestJob::DidDispatchFetchEvent(
|
| return;
|
| }
|
|
|
| - fetch_end_time_ = base::TimeTicks::Now();
|
| - load_timing_info_.send_end = fetch_end_time_;
|
| + load_timing_info_.send_end = base::TimeTicks::Now();
|
|
|
| // Creates a new HttpResponseInfo using the the ServiceWorker script's
|
| // HttpResponseInfo to show HTTPS padlock.
|
|
|