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

content/common/webkit_param_traits.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.
 
 // NOTE: New trait definitions that will be used by Chrome Frame must be placed
 // in common_param_traits2.cc.
 
 #include "content/common/webkit_param_traits.h"
 
 #include "base/string_number_conversions.h"
@@ skipping 21 matching lines @@
 NPVariant_Param::~NPVariant_Param() {
 }
 
 namespace IPC {
 
 void ParamTraits<webkit_glue::ResourceLoadTimingInfo>::Write(
     Message* m, const param_type& p) {
   WriteParam(m, p.base_time.is_null());
   if (p.base_time.is_null())
     return;
+  WriteParam(m, p.base_ticks);
   WriteParam(m, p.base_time);
   WriteParam(m, p.proxy_start);
   WriteParam(m, p.proxy_end);
   WriteParam(m, p.dns_start);
   WriteParam(m, p.dns_end);
   WriteParam(m, p.connect_start);
   WriteParam(m, p.connect_end);
   WriteParam(m, p.ssl_start);
   WriteParam(m, p.ssl_end);
   WriteParam(m, p.send_start);
   WriteParam(m, p.send_end);
   WriteParam(m, p.receive_headers_start);
   WriteParam(m, p.receive_headers_end);
 }
 
 bool ParamTraits<webkit_glue::ResourceLoadTimingInfo>::Read(
     const Message* m, void** iter, param_type* r) {
   bool is_null;
   if (!ReadParam(m, iter, &is_null))
     return false;
   if (is_null)
     return true;
 
   return
+      ReadParam(m, iter, &r->base_ticks) &&
       ReadParam(m, iter, &r->base_time) &&
       ReadParam(m, iter, &r->proxy_start) &&
       ReadParam(m, iter, &r->proxy_end) &&
       ReadParam(m, iter, &r->dns_start) &&
       ReadParam(m, iter, &r->dns_end) &&
       ReadParam(m, iter, &r->connect_start) &&
       ReadParam(m, iter, &r->connect_end) &&
       ReadParam(m, iter, &r->ssl_start) &&
       ReadParam(m, iter, &r->ssl_end) &&
       ReadParam(m, iter, &r->send_start) &&
       ReadParam(m, iter, &r->send_end) &&
       ReadParam(m, iter, &r->receive_headers_start) &&
       ReadParam(m, iter, &r->receive_headers_end);
 }
 
 void ParamTraits<webkit_glue::ResourceLoadTimingInfo>::Log(const param_type& p,
                                                            std::string* l) {
   l->append("(");
+  LogParam(p.base_ticks, l);
+  l->append(", ");
   LogParam(p.base_time, l);
   l->append(", ");
   LogParam(p.proxy_start, l);
   l->append(", ");
   LogParam(p.proxy_end, l);
   l->append(", ");
   LogParam(p.dns_start, l);
   l->append(", ");
   LogParam(p.dns_end, l);
   l->append(", ");
@@ skipping 252 matching lines @@
   WriteParam(m, p.mime_type);
   WriteParam(m, p.file_extensions);
   WriteParam(m, p.description);
   WriteParam(m, p.additional_param_names);
   WriteParam(m, p.additional_param_values);
 }
 
 bool ParamTraits<webkit::WebPluginMimeType>::Read(const Message* m,
                                                   void** iter,
                                                   param_type* p) {
   return

[jar (doing other things), 2011/10/15 02:42:13]

nit: per style guide: parethesize combined list, and align with leading paren
like:

return (some_long_condition &&
        another_condition);

[James Simonsen, 2011/10/18 23:15:47]

These aren't my changes. I don't know where they came from. I don't see them in
my tree. Maybe it was a bad merge? Or the tool got confused?

       ReadParam(m, iter, &p->mime_type) &&
       ReadParam(m, iter, &p->file_extensions) &&
       ReadParam(m, iter, &p->description) &&
       ReadParam(m, iter, &p->additional_param_names) &&
       ReadParam(m, iter, &p->additional_param_values);
 }
 
 void ParamTraits<webkit::WebPluginMimeType>::Log(
     const param_type& p, std::string* l) {
   l->append("(");
   LogParam(p.mime_type, l);               l->append(", ");

[jar (doing other things), 2011/10/15 02:42:13]

nit: one statement per line please.

   LogParam(p.file_extensions, l);         l->append(", ");
   LogParam(p.description, l);             l->append(", ");
   LogParam(p.additional_param_names, l);  l->append(", ");
   LogParam(p.additional_param_values, l);
   l->append(")");
 }
 
 void ParamTraits<webkit::WebPluginInfo>::Write(Message* m,
                                                const param_type& p) {
   WriteParam(m, p.name);
   WriteParam(m, p.path);
   WriteParam(m, p.version);
   WriteParam(m, p.desc);
   WriteParam(m, p.mime_types);
   WriteParam(m, p.type);
 }
 
 bool ParamTraits<webkit::WebPluginInfo>::Read(const Message* m,
                                               void** iter,
                                               param_type* p) {
   return
       ReadParam(m, iter, &p->name) &&

[jar (doing other things), 2011/10/15 02:42:13]

nit: return format.

       ReadParam(m, iter, &p->path) &&
       ReadParam(m, iter, &p->version) &&
       ReadParam(m, iter, &p->desc) &&
       ReadParam(m, iter, &p->mime_types) &&
       ReadParam(m, iter, &p->type);
 }
 void ParamTraits<webkit::WebPluginInfo>::Log(const param_type& p,
                                                  std::string* l) {
   l->append("(");
   LogParam(p.name, l);       l->append(", ");
   LogParam(p.path, l);       l->append(", ");
   LogParam(p.version, l);    l->append(", ");
   LogParam(p.desc, l);       l->append(", ");

[jar (doing other things), 2011/10/15 02:42:13]

nit: one statement per line.

   LogParam(p.mime_types, l); l->append(", ");
   LogParam(p.type, l);
   l->append(")");
 }
 
 void ParamTraits<webkit_glue::PasswordForm>::Write(Message* m,
                                                    const param_type& p) {
   WriteParam(m, p.signon_realm);
   WriteParam(m, p.origin);
   WriteParam(m, p.action);
@@ skipping 25 matching lines @@
       ReadParam(m, iter, &p->ssl_valid) &&
       ReadParam(m, iter, &p->preferred) &&
       ReadParam(m, iter, &p->blacklisted_by_user);
 }
 void ParamTraits<webkit_glue::PasswordForm>::Log(const param_type& p,
                                                  std::string* l) {
   l->append("<PasswordForm>");
 }
 
 }  // namespace IPC