Use a monotonic clock (TimeTicks) to report network times to WebCore.

content/common/resource_dispatcher.cc

 // Copyright (c) 2011 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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/common/resource_dispatcher.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/message_loop.h"
 #include "base/shared_memory.h"
 #include "base/string_util.h"
+#include "content/common/inter_process_time_ticks_converter.h"
 #include "content/common/request_extra_data.h"
 #include "content/common/resource_messages.h"
 #include "content/public/common/resource_dispatcher_delegate.h"
 #include "content/public/common/resource_response.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/upload_data.h"
 #include "net/http/http_response_headers.h"
 #include "webkit/glue/resource_type.h"
 
+using content::InterProcessTimeTicksConverter;
+using content::LocalTimeDelta;
+using content::LocalTimeTicks;
+using content::RemoteTimeDelta;
+using content::RemoteTimeTicks;
+
 // Each resource request is assigned an ID scoped to this process.
 static int MakeRequestID() {
   // NOTE: The resource_dispatcher_host also needs probably unique
   // request_ids, so they count down from -2 (-1 is a special we're
   // screwed value), while the renderer process counts up.
   static int next_request_id = 0;
   return next_request_id++;
 }
 
 // ResourceLoaderBridge implementation ----------------------------------------
@@ skipping 305 matching lines @@
   // Acknowledge receipt
   message_sender()->Send(
       new ResourceHostMsg_UploadProgress_ACK(message.routing_id(), request_id));
 }
 
 void ResourceDispatcher::OnReceivedResponse(
     int request_id, const content::ResourceResponseHead& response_head) {
   PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
   if (!request_info)
     return;
+  request_info->response_start = base::TimeTicks::Now();
 
   if (delegate_) {
     webkit_glue::ResourceLoaderBridge::Peer* new_peer =
         delegate_->OnReceivedResponse(
             request_info->peer, response_head.mime_type, request_info->url);
     if (new_peer)
       request_info->peer = new_peer;
   }
 
-  request_info->peer->OnReceivedResponse(response_head);
+  webkit_glue::ResourceResponseInfo renderer_response_info =
+      ConvertBrowserResponseToRendererResponse(*request_info, response_head);
+  request_info->peer->OnReceivedResponse(renderer_response_info);
 }
 
 void ResourceDispatcher::OnReceivedCachedMetadata(
       int request_id, const std::vector<char>& data) {
   PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
   if (!request_info)
     return;
 
   if (data.size())
     request_info->peer->OnReceivedCachedMetadata(&data.front(), data.size());
@@ skipping 33 matching lines @@
   if (!request_info)
     return;
 
   request_info->peer->OnDownloadedData(data_len);
 }
 
 void ResourceDispatcher::OnReceivedRedirect(
     const IPC::Message& message,
     int request_id,
     const GURL& new_url,
-    const webkit_glue::ResourceResponseInfo& info) {
+    const content::ResourceResponseHead& response_head) {
   PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
   if (!request_info)
     return;
+  request_info->response_start = base::TimeTicks::Now();
 
   int32 routing_id = message.routing_id();
   bool has_new_first_party_for_cookies = false;
   GURL new_first_party_for_cookies;
-  if (request_info->peer->OnReceivedRedirect(new_url, info,
-                                            &has_new_first_party_for_cookies,
-                                            &new_first_party_for_cookies)) {
+  webkit_glue::ResourceResponseInfo renderer_response_info =
+      ConvertBrowserResponseToRendererResponse(*request_info, response_head);
+  if (request_info->peer->OnReceivedRedirect(new_url, renderer_response_info,
+                                             &has_new_first_party_for_cookies,
+                                             &new_first_party_for_cookies)) {
     // Double-check if the request is still around. The call above could
     // potentially remove it.
     request_info = GetPendingRequestInfo(request_id);
     if (!request_info)
       return;
     request_info->pending_redirect_message.reset(
         new ResourceHostMsg_FollowRedirect(routing_id, request_id,
                                            has_new_first_party_for_cookies,
                                            new_first_party_for_cookies));
     if (!request_info->is_deferred) {
       FollowPendingRedirect(request_id, *request_info);
     }
   } else {
     CancelPendingRequest(routing_id, request_id);
   }
 }
 
 void ResourceDispatcher::FollowPendingRedirect(
     int request_id,
     PendingRequestInfo& request_info) {
   IPC::Message* msg = request_info.pending_redirect_message.release();
   if (msg)
     message_sender()->Send(msg);
 }
 
-void ResourceDispatcher::OnRequestComplete(int request_id,
-                                           const net::URLRequestStatus& status,
-                                           const std::string& security_info,
-                                           const base::Time& completion_time) {
+void ResourceDispatcher::OnRequestComplete(
+    int request_id,
+    const net::URLRequestStatus& status,
+    const std::string& security_info,
+    const base::TimeTicks& browser_completion_time) {
   PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
   if (!request_info)
     return;
+  request_info->completion_time = base::TimeTicks::Now();
 
   webkit_glue::ResourceLoaderBridge::Peer* peer = request_info->peer;
 
   if (delegate_) {
     webkit_glue::ResourceLoaderBridge::Peer* new_peer =
         delegate_->OnRequestComplete(
             request_info->peer, request_info->resource_type, status);
     if (new_peer)
       request_info->peer = new_peer;
   }
 
+  base::TimeTicks renderer_completion_time =
+      ConvertBrowserCompletionToRendererCompletion(*request_info,
+                                                   browser_completion_time);
   // The request ID will be removed from our pending list in the destructor.
   // Normally, dispatching this message causes the reference-counted request to
   // die immediately.
-  peer->OnCompletedRequest(status, security_info, completion_time);
+  peer->OnCompletedRequest(status, security_info, renderer_completion_time);
 }
 
 int ResourceDispatcher::AddPendingRequest(
     webkit_glue::ResourceLoaderBridge::Peer* callback,
     ResourceType::Type resource_type,
     const GURL& request_url) {
   // Compute a unique request_id for this renderer process.
   int id = MakeRequestID();
   pending_requests_[id] =
       PendingRequestInfo(callback, resource_type, request_url);
@@ skipping 90 matching lines @@
       }
     }
   }
 }
 
 webkit_glue::ResourceLoaderBridge* ResourceDispatcher::CreateBridge(
     const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) {
   return new webkit_glue::IPCResourceLoaderBridge(this, request_info);
 }
 
+webkit_glue::ResourceResponseInfo
+ResourceDispatcher::ConvertBrowserResponseToRendererResponse(

[darin (slow to review), 2011/12/12 22:25:46]

nit: this seems like a good use case for an out-param.  the ResourceResponseInfo
copy constructor generates a fair bit of code.  you could also get away with
just calling this function ToResourceResponseInfo, which is a bit shorter and
perhaps more precise.

[James Simonsen, 2011/12/12 23:35:34]

Done.

+    const PendingRequestInfo& request_info,
+    const content::ResourceResponseHead& browser_info) const {
+  if (request_info.request_start.is_null() ||
+      request_info.response_start.is_null() ||
+      browser_info.request_start.is_null() ||
+      browser_info.response_start.is_null()) {
+    return browser_info;
+  }
+  webkit_glue::ResourceResponseInfo renderer_info = browser_info;
+  content::InterProcessTimeTicksConverter converter(
+      LocalTimeTicks::FromTimeTicks(request_info.request_start),
+      LocalTimeTicks::FromTimeTicks(request_info.response_start),
+      RemoteTimeTicks::FromTimeTicks(browser_info.request_start),
+      RemoteTimeTicks::FromTimeTicks(browser_info.response_start));
+
+  LocalTimeTicks renderer_base_ticks = converter.ConvertMilliseconds(
+      RemoteTimeTicks::FromTimeTicks(browser_info.load_timing.base_ticks));
+  renderer_info.load_timing.base_ticks = renderer_base_ticks.ToTimeTicks();
+
+#define CONVERT(field) \
+  LocalTimeDelta renderer_##field = converter.ConvertDelta( \
+      RemoteTimeDelta::FromRawDelta(browser_info.load_timing.field)); \
+  renderer_info.load_timing.field = renderer_##field.ToInt32()
+
+  CONVERT(proxy_start);
+  CONVERT(dns_start);
+  CONVERT(dns_end);
+  CONVERT(connect_start);
+  CONVERT(connect_end);
+  CONVERT(ssl_start);
+  CONVERT(ssl_end);
+  CONVERT(send_start);
+  CONVERT(send_end);
+  CONVERT(receive_headers_start);
+  CONVERT(receive_headers_end);
+
+#undef CONVERT
+
+  return renderer_info;
+}
+
+base::TimeTicks
+ResourceDispatcher::ConvertBrowserCompletionToRendererCompletion(

[darin (slow to review), 2011/12/12 22:25:46]

nit: maybe just shorten this function named down to ToRendererCompletionTime? 
(I think it at least helps to include the word "time" in the name.)

[James Simonsen, 2011/12/12 23:35:34]

Done.

+    const PendingRequestInfo& request_info,
+    const base::TimeTicks& browser_completion_time) const {
+  if (request_info.completion_time.is_null()) {
+    return browser_completion_time;
+  }
+
+  // TODO(simonjam): The optimal lower bound should be the most recent value of
+  // TimeTicks::Now() returned to WebKit. Is it worth trying to cache that?
+  // Until then, |response_start| is used as it is the most recent value
+  // returned for this request.
+  LocalTimeTicks renderer_completion_time =
+      content::InterProcessTimeTicksConverter::ClampTimeInRange(
+          RemoteTimeTicks::FromTimeTicks(browser_completion_time),
+          LocalTimeTicks::FromTimeTicks(request_info.response_start),
+          LocalTimeTicks::FromTimeTicks(request_info.completion_time));
+  return renderer_completion_time.ToTimeTicks();
+}
+
+// static
 bool ResourceDispatcher::IsResourceDispatcherMessage(
     const IPC::Message& message) {
   switch (message.type()) {
     case ResourceMsg_UploadProgress::ID:
     case ResourceMsg_ReceivedResponse::ID:
     case ResourceMsg_ReceivedCachedMetadata::ID:
     case ResourceMsg_ReceivedRedirect::ID:
     case ResourceMsg_DataReceived::ID:
     case ResourceMsg_DataDownloaded::ID:
     case ResourceMsg_RequestComplete::ID:
@@ skipping 30 matching lines @@
 
 // static
 void ResourceDispatcher::ReleaseResourcesInMessageQueue(MessageQueue* queue) {
   while (!queue->empty()) {
     IPC::Message* message = queue->front();
     ReleaseResourcesInDataMessage(*message);
     queue->pop_front();
     delete message;
   }
 }