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

In order to contain the newer timing information, net::LoadTimingInfo::ServiceWorkerTiming is defined and contained in net::LoadTimingInfo. Of course this struct is widely used, so is this okey? or is there some another solution?

1st patch: https://codereview.chromium.org/515583005/

BUG=401389
TEST=N/A

Review URL: https://codereview.chromium.org/515753003

Cr-Commit-Position: refs/heads/master@{#295635}

content/browser/loader/resource_loader.cc

@@ -60,7 +60,10 @@ void PopulateResourceResponse(ResourceRequestInfoImpl* info,
           ServiceWorkerRequestHandler::GetHandler(request)) {
     handler->GetExtraResponseInfo(
         &response->head.was_fetched_via_service_worker,
-        &response->head.original_url_via_service_worker);
+        &response->head.original_url_via_service_worker,
+        &response->head.service_worker_fetch_start,
+        &response->head.service_worker_fetch_ready,
+        &response->head.service_worker_fetch_end);
   }
   AppCacheInterceptor::GetExtraResponseInfo(
       request,

content/browser/service_worker/service_worker_context_request_handler.cc

@@ -4,6 +4,7 @@
 
 #include "content/browser/service_worker/service_worker_context_request_handler.h"
 
+#include "base/time/time.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_provider_host.h"
 #include "content/browser/service_worker/service_worker_read_from_cache_job.h"
@@ -89,7 +90,10 @@ net::URLRequestJob* ServiceWorkerContextRequestHandler::MaybeCreateJob(
 
 void ServiceWorkerContextRequestHandler::GetExtraResponseInfo(
     bool* was_fetched_via_service_worker,
-    GURL* original_url_via_service_worker) const {
+    GURL* original_url_via_service_worker,
+    base::TimeTicks* fetch_start_time,
+    base::TimeTicks* fetch_ready_time,
+    base::TimeTicks* fetch_end_time) const {
   *was_fetched_via_service_worker = false;
   *original_url_via_service_worker = GURL();
 }

content/browser/service_worker/service_worker_context_request_handler.h

@@ -30,7 +30,10 @@ class CONTENT_EXPORT ServiceWorkerContextRequestHandler
 
   virtual void GetExtraResponseInfo(
       bool* was_fetched_via_service_worker,
-      GURL* original_url_via_service_worker) const OVERRIDE;
+      GURL* original_url_via_service_worker,
+      base::TimeTicks* fetch_start_time,
+      base::TimeTicks* fetch_ready_time,
+      base::TimeTicks* fetch_end_time) const OVERRIDE;
 
  private:
   bool ShouldAddToScriptCache(const GURL& url);

content/browser/service_worker/service_worker_controllee_request_handler.cc

@@ -96,14 +96,20 @@ net::URLRequestJob* ServiceWorkerControlleeRequestHandler::MaybeCreateJob(
 
 void ServiceWorkerControlleeRequestHandler::GetExtraResponseInfo(
     bool* was_fetched_via_service_worker,
-    GURL* original_url_via_service_worker) const {
+    GURL* original_url_via_service_worker,
+    base::TimeTicks* fetch_start_time,
+    base::TimeTicks* fetch_ready_time,
+    base::TimeTicks* fetch_end_time) const {
   if (!job_.get()) {
     *was_fetched_via_service_worker = false;
     *original_url_via_service_worker = GURL();
     return;
   }
   job_->GetExtraResponseInfo(was_fetched_via_service_worker,
-                             original_url_via_service_worker);
+                             original_url_via_service_worker,
+                             fetch_start_time,
+                             fetch_ready_time,
+                             fetch_end_time);
 }
 
 void ServiceWorkerControlleeRequestHandler::PrepareForMainResource(

content/browser/service_worker/service_worker_controllee_request_handler.h

@@ -40,7 +40,10 @@ class CONTENT_EXPORT ServiceWorkerControlleeRequestHandler
 
   virtual void GetExtraResponseInfo(
       bool* was_fetched_via_service_worker,
-      GURL* original_url_via_service_worker) const OVERRIDE;
+      GURL* original_url_via_service_worker,
+      base::TimeTicks* fetch_start_time,
+      base::TimeTicks* fetch_ready_time,
+      base::TimeTicks* fetch_end_time) const OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ServiceWorkerControlleeRequestHandlerTest,

content/browser/service_worker/service_worker_request_handler.h

@@ -8,6 +8,7 @@
 #include "base/basictypes.h"
 #include "base/memory/weak_ptr.h"
 #include "base/supports_user_data.h"
+#include "base/time/time.h"
 #include "content/common/content_export.h"
 #include "content/common/service_worker/service_worker_status_code.h"
 #include "content/public/common/resource_type.h"
@@ -68,7 +69,10 @@ class CONTENT_EXPORT ServiceWorkerRequestHandler
 
   virtual void GetExtraResponseInfo(
       bool* was_fetched_via_service_worker,
-      GURL* original_url_via_service_worker) const = 0;
+      GURL* original_url_via_service_worker,
+      base::TimeTicks* fetch_start_time,
+      base::TimeTicks* fetch_ready_time,
+      base::TimeTicks* fetch_end_time) const = 0;
 
  protected:
   ServiceWorkerRequestHandler(

content/browser/service_worker/service_worker_url_request_job.cc

@@ -11,6 +11,7 @@
 #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"
@@ -88,6 +89,12 @@ 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 {
+  *load_timing_info = load_timing_info_;
 }
 
 int ServiceWorkerURLRequestJob::GetResponseCode() const {
@@ -159,6 +166,7 @@ void ServiceWorkerURLRequestJob::OnBeforeNetworkStart(net::URLRequest* request,
 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();
 }
 
@@ -184,7 +192,10 @@ const net::HttpResponseInfo* ServiceWorkerURLRequestJob::http_info() const {
 
 void ServiceWorkerURLRequestJob::GetExtraResponseInfo(
     bool* was_fetched_via_service_worker,
-    GURL* original_url_via_service_worker) const {
+    GURL* original_url_via_service_worker,
+    base::TimeTicks* fetch_start_time,
+    base::TimeTicks* fetch_ready_time,
+    base::TimeTicks* fetch_end_time) const {
   if (response_type_ != FORWARD_TO_SERVICE_WORKER) {
     *was_fetched_via_service_worker = false;
     *original_url_via_service_worker = GURL();
@@ -192,6 +203,9 @@ void ServiceWorkerURLRequestJob::GetExtraResponseInfo(
   }
   *was_fetched_via_service_worker = true;
   *original_url_via_service_worker = response_url_;
+  *fetch_start_time = fetch_start_time_;
+  *fetch_ready_time = fetch_ready_time_;
+  *fetch_end_time = fetch_end_time_;
 }
 
 
@@ -233,6 +247,8 @@ void ServiceWorkerURLRequestJob::StartRequest() {
                      weak_factory_.GetWeakPtr()),
           base::Bind(&ServiceWorkerURLRequestJob::DidDispatchFetchEvent,
                      weak_factory_.GetWeakPtr())));
+      fetch_start_time_ = base::TimeTicks::Now();
+      load_timing_info_.send_start = fetch_start_time_;
       fetch_dispatcher_->Run();
       return;
   }
@@ -329,8 +345,7 @@ bool ServiceWorkerURLRequestJob::CreateRequestBodyBlob(std::string* blob_uuid,
 }
 
 void ServiceWorkerURLRequestJob::DidPrepareFetchEvent() {
-  // TODO(shimazu): Set the timestamp to measure the time to launch SW
-  // This is related to this (http://crbug.com/401389)
+  fetch_ready_time_ = base::TimeTicks::Now();
 }
 
 void ServiceWorkerURLRequestJob::DidDispatchFetchEvent(
@@ -371,6 +386,9 @@ void ServiceWorkerURLRequestJob::DidDispatchFetchEvent(
     return;
   }
 
+  fetch_end_time_ = base::TimeTicks::Now();
+  load_timing_info_.send_end = fetch_end_time_;
+
   // Set up a request for reading the blob.
   if (!response.blob_uuid.empty() && blob_storage_context_) {
     scoped_ptr<storage::BlobDataHandle> blob_data_handle =
@@ -388,6 +406,7 @@ void ServiceWorkerURLRequestJob::DidDispatchFetchEvent(
   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();
 }

content/browser/service_worker/service_worker_url_request_job.h

@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/memory/weak_ptr.h"
+#include "base/time/time.h"
 #include "content/common/content_export.h"
 #include "content/common/service_worker/service_worker_status_code.h"
 #include "content/common/service_worker/service_worker_types.h"
@@ -57,6 +58,8 @@ class CONTENT_EXPORT ServiceWorkerURLRequestJob
   virtual bool GetCharset(std::string* charset) OVERRIDE;
   virtual bool GetMimeType(std::string* mime_type) const OVERRIDE;
   virtual void GetResponseInfo(net::HttpResponseInfo* info) OVERRIDE;
+  virtual void GetLoadTimingInfo(
+      net::LoadTimingInfo* load_timing_info) const OVERRIDE;
   virtual int GetResponseCode() const OVERRIDE;
   virtual void SetExtraRequestHeaders(
       const net::HttpRequestHeaders& headers) OVERRIDE;
@@ -86,7 +89,10 @@ class CONTENT_EXPORT ServiceWorkerURLRequestJob
   const net::HttpResponseInfo* http_info() const;
 
   void GetExtraResponseInfo(bool* was_fetched_via_service_worker,
-                            GURL* original_url_via_service_worker) const;
+                            GURL* original_url_via_service_worker,
+                            base::TimeTicks* fetch_start_time,
+                            base::TimeTicks* fetch_ready_time,
+                            base::TimeTicks* fetch_end_time) const;
 
  protected:
   virtual ~ServiceWorkerURLRequestJob();
@@ -131,6 +137,13 @@ class CONTENT_EXPORT ServiceWorkerURLRequestJob
 
   base::WeakPtr<ServiceWorkerProviderHost> provider_host_;
 
+  // Timing info to show on the popup in Devtools' Network tab.
+  net::LoadTimingInfo load_timing_info_;
+  base::TimeTicks fetch_start_time_;
+  base::TimeTicks fetch_ready_time_;
+  base::TimeTicks fetch_end_time_;
+  base::Time response_time_;
+
   ResponseType response_type_;
   bool is_started_;
 

content/child/resource_dispatcher.cc

@@ -783,6 +783,12 @@ void ResourceDispatcher::ToResourceResponseInfo(
   RemoteToLocalTimeTicks(converter, &load_timing->send_start);
   RemoteToLocalTimeTicks(converter, &load_timing->send_end);
   RemoteToLocalTimeTicks(converter, &load_timing->receive_headers_end);
+  RemoteToLocalTimeTicks(converter,
+                         &renderer_info->service_worker_fetch_start);
+  RemoteToLocalTimeTicks(converter,
+                         &renderer_info->service_worker_fetch_ready);
+  RemoteToLocalTimeTicks(converter,
+                         &renderer_info->service_worker_fetch_end);
 
   // Collect UMA on the inter-process skew.
   bool is_skew_additive = false;

content/child/web_url_loader_impl.cc

@@ -777,6 +777,13 @@ void WebURLLoaderImpl::PopulateURLResponse(const GURL& url,
   if (!info.load_timing.receive_headers_end.is_null()) {
     WebURLLoadTiming timing;
     PopulateURLLoadTiming(info.load_timing, &timing);
+    const TimeTicks kNullTicks;
+    timing.setServiceWorkerFetchStart(
+        (info.service_worker_fetch_start - kNullTicks).InSecondsF());
+    timing.setServiceWorkerFetchReady(
+        (info.service_worker_fetch_ready - kNullTicks).InSecondsF());
+    timing.setServiceWorkerFetchEnd(
+        (info.service_worker_fetch_end - kNullTicks).InSecondsF());
     response->setLoadTiming(timing);
   }
 

content/common/resource_messages.h

@@ -120,6 +120,9 @@ IPC_STRUCT_TRAITS_BEGIN(content::ResourceResponseInfo)
   IPC_STRUCT_TRAITS_MEMBER(socket_address)
   IPC_STRUCT_TRAITS_MEMBER(was_fetched_via_service_worker)
   IPC_STRUCT_TRAITS_MEMBER(original_url_via_service_worker)
+  IPC_STRUCT_TRAITS_MEMBER(service_worker_fetch_start)
+  IPC_STRUCT_TRAITS_MEMBER(service_worker_fetch_ready)
+  IPC_STRUCT_TRAITS_MEMBER(service_worker_fetch_end)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(net::RedirectInfo)

content/public/common/resource_response_info.h

@@ -104,6 +104,12 @@ struct ResourceResponseInfo {
   // The original URL of the response which was fetched by the ServiceWorker.
   // This may be empty if the response was created inside the ServiceWorker.
   GURL original_url_via_service_worker;
+
+  // ServiceWorker Timing Information. These will be set if the response is
+  // provided by the ServiceWorker, or kept empty.
+  base::TimeTicks service_worker_fetch_start;
+  base::TimeTicks service_worker_fetch_ready;
+  base::TimeTicks service_worker_fetch_end;
 };
 
 }  // namespace content