OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 // NOTE: New trait definitions that will be used by Chrome Frame must be placed | 5 // NOTE: New trait definitions that will be used by Chrome Frame must be placed |
6 // in common_param_traits2.cc. | 6 // in common_param_traits2.cc. |
7 | 7 |
8 #include "content/common/webkit_param_traits.h" | 8 #include "content/common/webkit_param_traits.h" |
9 | 9 |
10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
(...skipping 21 matching lines...) Expand all Loading... |
32 NPVariant_Param::~NPVariant_Param() { | 32 NPVariant_Param::~NPVariant_Param() { |
33 } | 33 } |
34 | 34 |
35 namespace IPC { | 35 namespace IPC { |
36 | 36 |
37 void ParamTraits<webkit_glue::ResourceLoadTimingInfo>::Write( | 37 void ParamTraits<webkit_glue::ResourceLoadTimingInfo>::Write( |
38 Message* m, const param_type& p) { | 38 Message* m, const param_type& p) { |
39 WriteParam(m, p.base_time.is_null()); | 39 WriteParam(m, p.base_time.is_null()); |
40 if (p.base_time.is_null()) | 40 if (p.base_time.is_null()) |
41 return; | 41 return; |
| 42 WriteParam(m, p.base_ticks); |
42 WriteParam(m, p.base_time); | 43 WriteParam(m, p.base_time); |
43 WriteParam(m, p.proxy_start); | 44 WriteParam(m, p.proxy_start); |
44 WriteParam(m, p.proxy_end); | 45 WriteParam(m, p.proxy_end); |
45 WriteParam(m, p.dns_start); | 46 WriteParam(m, p.dns_start); |
46 WriteParam(m, p.dns_end); | 47 WriteParam(m, p.dns_end); |
47 WriteParam(m, p.connect_start); | 48 WriteParam(m, p.connect_start); |
48 WriteParam(m, p.connect_end); | 49 WriteParam(m, p.connect_end); |
49 WriteParam(m, p.ssl_start); | 50 WriteParam(m, p.ssl_start); |
50 WriteParam(m, p.ssl_end); | 51 WriteParam(m, p.ssl_end); |
51 WriteParam(m, p.send_start); | 52 WriteParam(m, p.send_start); |
52 WriteParam(m, p.send_end); | 53 WriteParam(m, p.send_end); |
53 WriteParam(m, p.receive_headers_start); | 54 WriteParam(m, p.receive_headers_start); |
54 WriteParam(m, p.receive_headers_end); | 55 WriteParam(m, p.receive_headers_end); |
55 } | 56 } |
56 | 57 |
57 bool ParamTraits<webkit_glue::ResourceLoadTimingInfo>::Read( | 58 bool ParamTraits<webkit_glue::ResourceLoadTimingInfo>::Read( |
58 const Message* m, void** iter, param_type* r) { | 59 const Message* m, void** iter, param_type* r) { |
59 bool is_null; | 60 bool is_null; |
60 if (!ReadParam(m, iter, &is_null)) | 61 if (!ReadParam(m, iter, &is_null)) |
61 return false; | 62 return false; |
62 if (is_null) | 63 if (is_null) |
63 return true; | 64 return true; |
64 | 65 |
65 return | 66 return |
| 67 ReadParam(m, iter, &r->base_ticks) && |
66 ReadParam(m, iter, &r->base_time) && | 68 ReadParam(m, iter, &r->base_time) && |
67 ReadParam(m, iter, &r->proxy_start) && | 69 ReadParam(m, iter, &r->proxy_start) && |
68 ReadParam(m, iter, &r->proxy_end) && | 70 ReadParam(m, iter, &r->proxy_end) && |
69 ReadParam(m, iter, &r->dns_start) && | 71 ReadParam(m, iter, &r->dns_start) && |
70 ReadParam(m, iter, &r->dns_end) && | 72 ReadParam(m, iter, &r->dns_end) && |
71 ReadParam(m, iter, &r->connect_start) && | 73 ReadParam(m, iter, &r->connect_start) && |
72 ReadParam(m, iter, &r->connect_end) && | 74 ReadParam(m, iter, &r->connect_end) && |
73 ReadParam(m, iter, &r->ssl_start) && | 75 ReadParam(m, iter, &r->ssl_start) && |
74 ReadParam(m, iter, &r->ssl_end) && | 76 ReadParam(m, iter, &r->ssl_end) && |
75 ReadParam(m, iter, &r->send_start) && | 77 ReadParam(m, iter, &r->send_start) && |
76 ReadParam(m, iter, &r->send_end) && | 78 ReadParam(m, iter, &r->send_end) && |
77 ReadParam(m, iter, &r->receive_headers_start) && | 79 ReadParam(m, iter, &r->receive_headers_start) && |
78 ReadParam(m, iter, &r->receive_headers_end); | 80 ReadParam(m, iter, &r->receive_headers_end); |
79 } | 81 } |
80 | 82 |
81 void ParamTraits<webkit_glue::ResourceLoadTimingInfo>::Log(const param_type& p, | 83 void ParamTraits<webkit_glue::ResourceLoadTimingInfo>::Log(const param_type& p, |
82 std::string* l) { | 84 std::string* l) { |
83 l->append("("); | 85 l->append("("); |
| 86 LogParam(p.base_ticks, l); |
| 87 l->append(", "); |
84 LogParam(p.base_time, l); | 88 LogParam(p.base_time, l); |
85 l->append(", "); | 89 l->append(", "); |
86 LogParam(p.proxy_start, l); | 90 LogParam(p.proxy_start, l); |
87 l->append(", "); | 91 l->append(", "); |
88 LogParam(p.proxy_end, l); | 92 LogParam(p.proxy_end, l); |
89 l->append(", "); | 93 l->append(", "); |
90 LogParam(p.dns_start, l); | 94 LogParam(p.dns_start, l); |
91 l->append(", "); | 95 l->append(", "); |
92 LogParam(p.dns_end, l); | 96 LogParam(p.dns_end, l); |
93 l->append(", "); | 97 l->append(", "); |
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
370 ReadParam(m, iter, &p->ssl_valid) && | 374 ReadParam(m, iter, &p->ssl_valid) && |
371 ReadParam(m, iter, &p->preferred) && | 375 ReadParam(m, iter, &p->preferred) && |
372 ReadParam(m, iter, &p->blacklisted_by_user); | 376 ReadParam(m, iter, &p->blacklisted_by_user); |
373 } | 377 } |
374 void ParamTraits<webkit_glue::PasswordForm>::Log(const param_type& p, | 378 void ParamTraits<webkit_glue::PasswordForm>::Log(const param_type& p, |
375 std::string* l) { | 379 std::string* l) { |
376 l->append("<PasswordForm>"); | 380 l->append("<PasswordForm>"); |
377 } | 381 } |
378 | 382 |
379 } // namespace IPC | 383 } // namespace IPC |
OLD | NEW |