Inject timestamps to resource messages.

content/common/resource_dispatcher.cc

 // Copyright (c) 2012 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"
@@ skipping 239 matching lines @@
   response->devtools_info = result.devtools_info;
   response->data.swap(result.data);
   response->download_file_path = result.download_file_path;
 }
 
 // ResourceDispatcher ---------------------------------------------------------
 
 ResourceDispatcher::ResourceDispatcher(IPC::Sender* sender)
     : message_sender_(sender),
       weak_factory_(this),
-      delegate_(NULL) {
+      delegate_(NULL),
+      io_timestamp_(base::TimeTicks()) {
 }
 
 ResourceDispatcher::~ResourceDispatcher() {
 }
 
 // ResourceDispatcher implementation ------------------------------------------
 
 bool ResourceDispatcher::OnMessageReceived(const IPC::Message& message) {
   if (!IsResourceDispatcherMessage(message)) {
     return false;
@@ skipping 56 matching lines @@
   // Acknowledge receipt
   message_sender()->Send(
       new ResourceHostMsg_UploadProgress_ACK(message.routing_id(), request_id));
 }
 
 void ResourceDispatcher::OnReceivedResponse(
     int request_id, const ResourceResponseHead& response_head) {
   PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
   if (!request_info)
     return;
-  request_info->response_start = base::TimeTicks::Now();
+  if (io_timestamp_ == base::TimeTicks())
+    request_info->response_start = base::TimeTicks::Now();
+  else {
+    request_info->response_start = io_timestamp_;
+    io_timestamp_ = base::TimeTicks();
+  }
 
   if (delegate_) {
     ResourceLoaderBridge::Peer* new_peer =
         delegate_->OnReceivedResponse(
             request_info->peer, response_head.mime_type, request_info->url);
     if (new_peer)
       request_info->peer = new_peer;
   }
 
   ResourceResponseInfo renderer_response_info;
@@ skipping 92 matching lines @@
 }
 
 void ResourceDispatcher::OnReceivedRedirect(
     const IPC::Message& message,
     int request_id,
     const GURL& new_url,
     const ResourceResponseHead& response_head) {
   PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
   if (!request_info)
     return;
-  request_info->response_start = base::TimeTicks::Now();
+  if (io_timestamp_ == base::TimeTicks())
+    request_info->response_start = base::TimeTicks::Now();
+  else {
+    request_info->response_start = io_timestamp_;
+    io_timestamp_ = base::TimeTicks();
+  }
 
   int32 routing_id = message.routing_id();
   bool has_new_first_party_for_cookies = false;
   GURL new_first_party_for_cookies;
   ResourceResponseInfo renderer_response_info;
   ToResourceResponseInfo(*request_info, response_head, &renderer_response_info);
   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
@@ skipping 23 matching lines @@
 
 void ResourceDispatcher::OnRequestComplete(
     int request_id,
     int error_code,
     bool was_ignored_by_handler,
     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();
+  if (io_timestamp_ == base::TimeTicks())
+    request_info->completion_time = base::TimeTicks::Now();
+  else {
+    request_info->completion_time = io_timestamp_;
+    io_timestamp_ = base::TimeTicks();
+  }

[Charlie Reis, 2013/05/23 20:13:11]

Please abstract this into a helper method rather than copy/pasting it 3 times.

[eustas, 2013/05/24 15:22:28]

Done.

   request_info->buffer.reset();
   request_info->buffer_size = 0;
 
   ResourceLoaderBridge::Peer* peer = request_info->peer;
 
   if (delegate_) {
     ResourceLoaderBridge::Peer* new_peer =
         delegate_->OnRequestComplete(
             request_info->peer, request_info->resource_type, error_code);
     if (new_peer)
@@ skipping 245 matching lines @@
 void ResourceDispatcher::ReleaseResourcesInMessageQueue(MessageQueue* queue) {
   while (!queue->empty()) {
     IPC::Message* message = queue->front();
     ReleaseResourcesInDataMessage(*message);
     queue->pop_front();
     delete message;
   }
 }
 
 }  // namespace content