Fix ResourceLoadTiming resolution lose issue (chromium part)

webkit/glue/weburlloader_impl.cc

Index: webkit/glue/weburlloader_impl.cc
diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc
index 2145ce32586b8d9db3c5b915f00071ee48651043..0a8611835a0f0328a9b42cf4a31c800536f7466c 100644
--- a/webkit/glue/weburlloader_impl.cc
+++ b/webkit/glue/weburlloader_impl.cc
@@ -150,16 +150,6 @@ bool GetInfoFromDataURL(const GURL& url,
 
 typedef ResourceDevToolsInfo::HeadersVector HeadersVector;
 
-// Given a base time and a second time, returns the time from the base time to
-// the second time, in milliseconds.  If the second time is null, returns -1.
-// The base time must not be null.
-int TimeTicksToOffset(base::TimeTicks base_time, base::TimeTicks time) {
-  if (time.is_null())
-    return -1;
-  DCHECK(!base_time.is_null());
-  return static_cast<int>((time - base_time).InMillisecondsRoundedUp());
-}
-
 // Converts timing data from |load_timing| to the format used by WebKit.
 void PopulateURLLoadTiming(const net::LoadTimingInfo& load_timing,
                            WebURLLoadTiming* url_timing) {
@@ -168,33 +158,28 @@ void PopulateURLLoadTiming(const net::LoadTimingInfo& load_timing,
   url_timing->initialize();
   url_timing->setRequestTime(
       (load_timing.request_start - TimeTicks()).InSecondsF());
-  url_timing->setProxyStart(TimeTicksToOffset(load_timing.request_start,
-                                              load_timing.proxy_resolve_start));
-  url_timing->setProxyEnd(TimeTicksToOffset(load_timing.request_start,
-                                            load_timing.proxy_resolve_end));
-  url_timing->setDNSStart(TimeTicksToOffset(
-      load_timing.request_start,
-      load_timing.connect_timing.dns_start));
-  url_timing->setDNSEnd(TimeTicksToOffset(load_timing.request_start,
-                                          load_timing.connect_timing.dns_end));
+  url_timing->setProxyStart(
+      (load_timing.proxy_resolve_start - TimeTicks()).InSecondsF());

[michaeln, 2013/05/24 00:46:01]

Odd... ticksFromThePast - ticksNow? Doesn't that make for a negative number or
am i somehow crosseyed?

Oh... nevermind... TimeTicks() produces an instance with ticks_ = 0.

Maybe make a local to help clarify, TimeTicks kNullTIcks, and use that local in
these calculations

+  url_timing->setProxyEnd(
+      (load_timing.proxy_resolve_end - TimeTicks()).InSecondsF());
+  url_timing->setDNSStart(
+      (load_timing.connect_timing.dns_start - TimeTicks()).InSecondsF());
+  url_timing->setDNSEnd(
+      (load_timing.connect_timing.dns_end - TimeTicks()).InSecondsF());
   url_timing->setConnectStart(
-      TimeTicksToOffset(load_timing.request_start,
-                        load_timing.connect_timing.connect_start));
+      (load_timing.connect_timing.connect_start - TimeTicks()).InSecondsF());
   url_timing->setConnectEnd(
-      TimeTicksToOffset(load_timing.request_start,
-                        load_timing.connect_timing.connect_end));
+      (load_timing.connect_timing.connect_end - TimeTicks()).InSecondsF());
   url_timing->setSSLStart(
-      TimeTicksToOffset(load_timing.request_start,
-                        load_timing.connect_timing.ssl_start));
-  url_timing->setSSLEnd(TimeTicksToOffset(load_timing.request_start,
-                                          load_timing.connect_timing.ssl_end));
-  url_timing->setSendStart(TimeTicksToOffset(load_timing.request_start,
-                                             load_timing.send_start));
-  url_timing->setSendEnd(TimeTicksToOffset(load_timing.request_start,
-                                           load_timing.send_end));
+      (load_timing.connect_timing.ssl_start - TimeTicks()).InSecondsF());
+  url_timing->setSSLEnd(
+      (load_timing.connect_timing.ssl_end - TimeTicks()).InSecondsF());
+  url_timing->setSendStart(
+      (load_timing.send_start - TimeTicks()).InSecondsF());
+  url_timing->setSendEnd(
+      (load_timing.send_end - TimeTicks()).InSecondsF());
   url_timing->setReceiveHeadersEnd(
-      TimeTicksToOffset(load_timing.request_start,
-                        load_timing.receive_headers_end));
+      (load_timing.receive_headers_end - TimeTicks()).InSecondsF());
 }
 
 void PopulateURLResponse(