Add ServiceWorker timing information on the popup panel in DevTools's Network tab (2/2)

content/browser/service_worker/service_worker_url_request_job.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/service_worker/service_worker_url_request_job.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/strings/stringprintf.h"
+#include "base/time/time.h"
 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h"
 #include "content/browser/service_worker/service_worker_provider_host.h"
 #include "content/common/resource_request_body.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "content/public/browser/blob_handle.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/common/page_transition_types.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
 #include "net/http/http_util.h"
 #include "webkit/browser/blob/blob_data_handle.h"
 #include "webkit/browser/blob/blob_storage_context.h"
 #include "webkit/browser/blob/blob_url_request_job_factory.h"
 
+using base::Time;
+using base::TimeTicks;

[michaeln, 2014/09/03 00:56:04]

are these needed, looks like you fully qualify them when using Time and
TimeTicks?

[shimazu, 2014/09/04 03:32:41]

Done.

+
 namespace content {
 
 ServiceWorkerURLRequestJob::ServiceWorkerURLRequestJob(
     net::URLRequest* request,
     net::NetworkDelegate* network_delegate,
     base::WeakPtr<ServiceWorkerProviderHost> provider_host,
     base::WeakPtr<storage::BlobStorageContext> blob_storage_context,
     scoped_refptr<ResourceRequestBody> body)
     : net::URLRequestJob(request, network_delegate),
       provider_host_(provider_host),
@@ skipping 42 matching lines @@
 bool ServiceWorkerURLRequestJob::GetMimeType(std::string* mime_type) const {
   if (!http_info())
     return false;
   return http_info()->headers->GetMimeType(mime_type);
 }
 
 void ServiceWorkerURLRequestJob::GetResponseInfo(net::HttpResponseInfo* info) {
   if (!http_info())
     return;
   *info = *http_info();
+  info->response_time = response_time_;
+}
+
+void ServiceWorkerURLRequestJob::GetLoadTimingInfo(
+  net::LoadTimingInfo* load_timing_info) const {

[mmenke, 2014/09/02 19:10:43]

+2 indent.

[shimazu, 2014/09/04 03:32:41]

Done.

+  *load_timing_info = load_timing_info_;
 }
 
 int ServiceWorkerURLRequestJob::GetResponseCode() const {
   if (!http_info())
     return -1;
   return http_info()->headers->response_code();
 }
 
 void ServiceWorkerURLRequestJob::SetExtraRequestHeaders(
     const net::HttpRequestHeaders& headers) {
@@ skipping 51 matching lines @@
 }
 
 void ServiceWorkerURLRequestJob::OnBeforeNetworkStart(net::URLRequest* request,
                                                       bool* defer) {
   NOTREACHED();
 }
 
 void ServiceWorkerURLRequestJob::OnResponseStarted(net::URLRequest* request) {
   // TODO(falken): Add Content-Length, Content-Type if they were not provided in
   // the ServiceWorkerResponse.
+  response_time_ = base::Time::Now();
   CommitResponseHeader();
 }
 
 void ServiceWorkerURLRequestJob::OnReadCompleted(net::URLRequest* request,
                                                  int bytes_read) {
   SetStatus(request->status());
   if (!request->status().is_success()) {
     NotifyDone(request->status());
     return;
   }
@@ skipping 43 matching lines @@
       return;
 
     case FALLBACK_TO_NETWORK:
       // Restart the request to create a new job. Our request handler will
       // return NULL, and the default job (which will hit network) should be
       // created.
       NotifyRestartRequired();
       return;
 
     case FORWARD_TO_SERVICE_WORKER:
+      load_timing_info_.request_start_time = base::Time::Now();
+      load_timing_info_.request_start = base::TimeTicks::Now();

[mmenke, 2014/09/02 19:10:43]

These two are populated by the URLRequest itself, so this isn't needed.

[shimazu, 2014/09/04 03:32:41]

Done.

       DCHECK(provider_host_ && provider_host_->active_version());
       DCHECK(!fetch_dispatcher_);
       // Send a fetch event to the ServiceWorker associated to the
       // provider_host.
       fetch_dispatcher_.reset(new ServiceWorkerFetchDispatcher(
           CreateFetchRequest(),
           provider_host_->active_version(),
           base::Bind(&ServiceWorkerURLRequestJob::DidPrepareFetchEvent,
                      weak_factory_.GetWeakPtr()),
           base::Bind(&ServiceWorkerURLRequestJob::DidDispatchFetchEvent,
                      weak_factory_.GetWeakPtr())));
+      load_timing_info_.serviceworker_timing.fetch_start =
+        base::TimeTicks::Now();

[mmenke, 2014/09/02 19:10:43]

+2 indent

[shimazu, 2014/09/04 03:32:41]

Done.

       fetch_dispatcher_->Run();
       return;
   }
 
   NOTREACHED();
 }
 
 scoped_ptr<ServiceWorkerFetchRequest>
 ServiceWorkerURLRequestJob::CreateFetchRequest() {
   std::string blob_uuid;
@@ skipping 71 matching lines @@
   }
 
   request_body_blob_data_handle_ =
       blob_storage_context_->AddFinishedBlob(blob_data.get());
   *blob_uuid = uuid;
   *blob_size = size;
   return true;
 }
 
 void ServiceWorkerURLRequestJob::DidPrepareFetchEvent() {
-  // TODO(shimazu): Set the timestamp to measure the time to launch SW
-  // This is related to this (http://crbug.com/401389)
+  load_timing_info_.serviceworker_timing.fetch_ready =
+    base::TimeTicks::Now();

[mmenke, 2014/09/02 19:10:43]

+2 indent.

[shimazu, 2014/09/04 03:32:41]

Done.

 }
 
 void ServiceWorkerURLRequestJob::DidDispatchFetchEvent(
     ServiceWorkerStatusCode status,
     ServiceWorkerFetchEventResult fetch_result,
     const ServiceWorkerResponse& response) {
   fetch_dispatcher_.reset();
 
   // Check if we're not orphaned.
   if (!request())
@@ skipping 13 matching lines @@
   if (fetch_result == SERVICE_WORKER_FETCH_EVENT_RESULT_FALLBACK) {
     // Change the response type and restart the request to fallback to
     // the network.
     response_type_ = FALLBACK_TO_NETWORK;
     NotifyRestartRequired();
     return;
   }
 
   // We should have a response now.
   DCHECK_EQ(SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, fetch_result);
+  load_timing_info_.serviceworker_timing.fetch_end = base::TimeTicks::Now();
 
   // Set up a request for reading the blob.
   if (!response.blob_uuid.empty() && blob_storage_context_) {
     scoped_ptr<storage::BlobDataHandle> blob_data_handle =
         blob_storage_context_->GetBlobDataFromUUID(response.blob_uuid);
     if (!blob_data_handle) {
       // The renderer gave us a bad blob UUID.
       DeliverErrorResponse();
       return;
     }
     blob_request_ = storage::BlobProtocolHandler::CreateBlobRequest(
         blob_data_handle.Pass(), request()->context(), this);
     blob_request_->Start();
   }
 
   response_url_ = response.url;
   CreateResponseHeader(
       response.status_code, response.status_text, response.headers);
+  load_timing_info_.receive_headers_end = base::TimeTicks::Now();
   if (!blob_request_)
     CommitResponseHeader();
 }
 
 void ServiceWorkerURLRequestJob::CreateResponseHeader(
-    int status_code,
-    const std::string& status_text,
-    const std::map<std::string, std::string>& headers) {
+  int status_code,
+  const std::string& status_text,
+  const std::map<std::string, std::string>& headers) {

[mmenke, 2014/09/02 19:10:43]

+2 indent for the above 3 lines.

[shimazu, 2014/09/04 03:32:41]

Done.

   // TODO(kinuko): If the response has an identifier to on-disk cache entry,
   // pull response header from the disk.
   std::string status_line(
       base::StringPrintf("HTTP/1.1 %d %s", status_code, status_text.c_str()));
   status_line.push_back('\0');
   http_response_headers_ = new net::HttpResponseHeaders(status_line);
   for (std::map<std::string, std::string>::const_iterator it = headers.begin();
        it != headers.end();
        ++it) {
     std::string header;
@@ skipping 14 matching lines @@
 void ServiceWorkerURLRequestJob::DeliverErrorResponse() {
   // TODO(falken): Print an error to the console of the ServiceWorker and of
   // the requesting page.
   CreateResponseHeader(500,
                        "Service Worker Response Error",
                        std::map<std::string, std::string>());
   CommitResponseHeader();
 }
 
 }  // namespace content