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

webkit/glue/resource_loader_bridge.h

 // 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.
 //
 // The intent of this file is to provide a type-neutral abstraction between
 // Chrome and WebKit for resource loading. This pure-virtual interface is
 // implemented by the embedder.
 //
 // One of these objects will be created by WebKit for each request. WebKit
 // will own the pointer to the bridge, and will delete it when the request is
@@ skipping 14 matching lines @@
 #endif
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/platform_file.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/host_port_pair.h"
 #include "net/url_request/url_request_status.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoadTiming.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
 #include "webkit/glue/resource_type.h"
 
 namespace net {
 class HttpResponseHeaders;
 }
 
 namespace webkit_glue {
 
 // Structure containing timing information for the request. It addresses
 // http://groups.google.com/group/http-archive-specification/web/har-1-1-spec
 // and http://dev.w3.org/2006/webapi/WebTiming/ needs.
 //
 // All the values for starts and ends are given in milliseconds and are
 // offsets with respect to the given base time.
 struct ResourceLoadTimingInfo {
   ResourceLoadTimingInfo();
   ~ResourceLoadTimingInfo();
 
-  // All the values in this struct are given as offsets in milliseconds wrt
-  // this base time.
+  // All the values in this struct are given as offsets in ticks wrt
+  // this base tick count.
+  base::TimeTicks base_ticks;
+
+  // The value of Time::Now() when base_ticks was set.
   base::Time base_time;
 
   // The time that proxy processing started. For requests with no proxy phase,
   // this time is -1.
   int32 proxy_start;
 
   // The time that proxy processing ended. For reused sockets this time
   // is -1.
   int32 proxy_end;
 
@@ skipping 197 matching lines @@
 
     // The response status.
     net::URLRequestStatus status;
 
     // The final URL of the response.  This may differ from the request URL in
     // the case of a server redirect.
     GURL url;
 
     // The response data.
     std::string data;
+
+    // TimeTicks when the network stack first receives the request.
+    base::TimeTicks net_start_time;
+
+    // TimeTicks when the response is sent to the renderer.
+    base::TimeTicks net_end_time;
   };
 
   // Generated by the bridge. This is implemented by our custom resource loader
   // within webkit. The Peer and it's bridge should have identical lifetimes
   // as they represent each end of a communication channel.
   //
   // These callbacks mirror net::URLRequest::Delegate and the order and
   // conditions in which they will be called are identical. See url_request.h
   // for more information.
   class Peer {
    public:
     virtual ~Peer() {}
 
     // Called as upload progress is made.
     // note: only for requests with LOAD_ENABLE_UPLOAD_PROGRESS set
     virtual void OnUploadProgress(uint64 position, uint64 size) = 0;
 
     // Called when a redirect occurs.  The implementation may return false to
     // suppress the redirect.  The given ResponseInfo provides complete
     // information about the redirect, and new_url is the URL that will be
     // loaded if this method returns true.  If this method returns true, the
     // output parameter *has_new_first_party_for_cookies indicates whether the
     // output parameter *new_first_party_for_cookies contains the new URL that
     // should be consulted for the third-party cookie blocking policy.
     virtual bool OnReceivedRedirect(const GURL& new_url,
                                     const ResourceResponseInfo& info,
+                                    const base::TimeTicks& net_start_time,

[darin (slow to review), 2011/12/06 01:06:32]

are you sure you wouldn't want to include these timestamps inside the
ResourceResponseInfo structure?

[James Simonsen, 2011/12/10 00:21:47]

Done.

+                                    const base::TimeTicks& net_end_time,
                                     bool* has_new_first_party_for_cookies,
                                     GURL* new_first_party_for_cookies) = 0;
 
     // Called when response headers are available (after all redirects have
     // been followed).
-    virtual void OnReceivedResponse(const ResourceResponseInfo& info) = 0;
+    virtual void OnReceivedResponse(const ResourceResponseInfo& info,
+                                    const base::TimeTicks& net_start_time,
+                                    const base::TimeTicks& net_end_time) = 0;
 
     // Called when a chunk of response data is downloaded.  This method may be
     // called multiple times or not at all if an error occurs.  This method is
     // only called if RequestInfo::download_to_file was set to true, and in
     // that case, OnReceivedData will not be called.
     virtual void OnDownloadedData(int len) = 0;
 
     // Called when a chunk of response data is available. This method may
     // be called multiple times or not at all if an error occurs.
     // The encoded_data_length is the length of the encoded data transferred
     // over the network, which could be different from data length (e.g. for
     // gzipped content), or -1 if if unknown.
     virtual void OnReceivedData(const char* data,
                                 int data_length,
                                 int encoded_data_length) = 0;
 
     // Called when metadata generated by the renderer is retrieved from the
     // cache. This method may be called zero or one times.
     virtual void OnReceivedCachedMetadata(const char* data, int len) { }
 
     // Called when the response is complete.  This method signals completion of
     // the resource load.ff
-    virtual void OnCompletedRequest(const net::URLRequestStatus& status,
-                                    const std::string& security_info,
-                                    const base::Time& completion_time) = 0;
+    virtual void OnCompletedRequest(
+        const net::URLRequestStatus& status,
+        const std::string& security_info,
+        const base::TimeTicks& completion_time) = 0;
   };
 
   // use WebKitPlatformSupportImpl::CreateResourceLoader() for construction, but
   // anybody can delete at any time, INCLUDING during processing of callbacks.
   virtual ~ResourceLoaderBridge();
 
   // Call this method before calling Start() to append a chunk of binary data
   // to the request body.  May only be used with HTTP(S) POST requests.
   virtual void AppendDataToUpload(const char* data, int data_len) = 0;
 
@@ skipping 51 matching lines @@
   // Construction must go through
   // WebKitPlatformSupportImpl::CreateResourceLoader()
   // For HTTP(S) POST requests, the AppendDataToUpload and AppendFileToUpload
   // methods may be called to construct the body of the request.
   ResourceLoaderBridge();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ResourceLoaderBridge);
 };
 
+// For testing purposes.
+WebKit::WebURLLoadTiming PopulateWebURLLoadTiming(
+    const ResourceLoadTimingInfo& timing_info,
+    const base::TimeTicks& ipc_request_time,
+    const base::TimeTicks& net_start_time,
+    const base::TimeTicks& net_end_time,
+    const base::TimeTicks& ipc_response_time);
+
 }  // namespace webkit_glue
 
 #endif  // WEBKIT_GLUE_RESOURCE_LOADER_BRIDGE_H_