OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "content/common/resource_messages.h" | 5 #include "content/common/resource_messages.h" |
6 | 6 |
7 #include "net/base/load_timing_info.h" | 7 #include "net/base/load_timing_info.h" |
8 #include "net/http/http_response_headers.h" | 8 #include "net/http/http_response_headers.h" |
9 | 9 |
10 namespace IPC { | 10 namespace IPC { |
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 WriteParam(m, p.proxy_resolve_end); | 219 WriteParam(m, p.proxy_resolve_end); |
220 WriteParam(m, p.connect_timing.dns_start); | 220 WriteParam(m, p.connect_timing.dns_start); |
221 WriteParam(m, p.connect_timing.dns_end); | 221 WriteParam(m, p.connect_timing.dns_end); |
222 WriteParam(m, p.connect_timing.connect_start); | 222 WriteParam(m, p.connect_timing.connect_start); |
223 WriteParam(m, p.connect_timing.connect_end); | 223 WriteParam(m, p.connect_timing.connect_end); |
224 WriteParam(m, p.connect_timing.ssl_start); | 224 WriteParam(m, p.connect_timing.ssl_start); |
225 WriteParam(m, p.connect_timing.ssl_end); | 225 WriteParam(m, p.connect_timing.ssl_end); |
226 WriteParam(m, p.send_start); | 226 WriteParam(m, p.send_start); |
227 WriteParam(m, p.send_end); | 227 WriteParam(m, p.send_end); |
228 WriteParam(m, p.receive_headers_end); | 228 WriteParam(m, p.receive_headers_end); |
| 229 WriteParam(m, p.push_start); |
| 230 WriteParam(m, p.push_end); |
229 } | 231 } |
230 | 232 |
231 bool ParamTraits<net::LoadTimingInfo>::Read(const base::Pickle* m, | 233 bool ParamTraits<net::LoadTimingInfo>::Read(const base::Pickle* m, |
232 base::PickleIterator* iter, | 234 base::PickleIterator* iter, |
233 param_type* r) { | 235 param_type* r) { |
234 bool has_no_times; | 236 bool has_no_times; |
235 if (!ReadParam(m, iter, &r->socket_log_id) || | 237 if (!ReadParam(m, iter, &r->socket_log_id) || |
236 !ReadParam(m, iter, &r->socket_reused) || | 238 !ReadParam(m, iter, &r->socket_reused) || |
237 !ReadParam(m, iter, &has_no_times)) { | 239 !ReadParam(m, iter, &has_no_times)) { |
238 return false; | 240 return false; |
239 } | 241 } |
240 if (has_no_times) | 242 if (has_no_times) |
241 return true; | 243 return true; |
242 | 244 |
243 return | 245 return |
244 ReadParam(m, iter, &r->request_start_time) && | 246 ReadParam(m, iter, &r->request_start_time) && |
245 ReadParam(m, iter, &r->request_start) && | 247 ReadParam(m, iter, &r->request_start) && |
246 ReadParam(m, iter, &r->proxy_resolve_start) && | 248 ReadParam(m, iter, &r->proxy_resolve_start) && |
247 ReadParam(m, iter, &r->proxy_resolve_end) && | 249 ReadParam(m, iter, &r->proxy_resolve_end) && |
248 ReadParam(m, iter, &r->connect_timing.dns_start) && | 250 ReadParam(m, iter, &r->connect_timing.dns_start) && |
249 ReadParam(m, iter, &r->connect_timing.dns_end) && | 251 ReadParam(m, iter, &r->connect_timing.dns_end) && |
250 ReadParam(m, iter, &r->connect_timing.connect_start) && | 252 ReadParam(m, iter, &r->connect_timing.connect_start) && |
251 ReadParam(m, iter, &r->connect_timing.connect_end) && | 253 ReadParam(m, iter, &r->connect_timing.connect_end) && |
252 ReadParam(m, iter, &r->connect_timing.ssl_start) && | 254 ReadParam(m, iter, &r->connect_timing.ssl_start) && |
253 ReadParam(m, iter, &r->connect_timing.ssl_end) && | 255 ReadParam(m, iter, &r->connect_timing.ssl_end) && |
254 ReadParam(m, iter, &r->send_start) && | 256 ReadParam(m, iter, &r->send_start) && |
255 ReadParam(m, iter, &r->send_end) && | 257 ReadParam(m, iter, &r->send_end) && |
256 ReadParam(m, iter, &r->receive_headers_end); | 258 ReadParam(m, iter, &r->receive_headers_end) && |
| 259 ReadParam(m, iter, &r->push_start) && |
| 260 ReadParam(m, iter, &r->push_end); |
257 } | 261 } |
258 | 262 |
259 void ParamTraits<net::LoadTimingInfo>::Log(const param_type& p, | 263 void ParamTraits<net::LoadTimingInfo>::Log(const param_type& p, |
260 std::string* l) { | 264 std::string* l) { |
261 l->append("("); | 265 l->append("("); |
262 LogParam(p.socket_log_id, l); | 266 LogParam(p.socket_log_id, l); |
263 l->append(","); | 267 l->append(","); |
264 LogParam(p.socket_reused, l); | 268 LogParam(p.socket_reused, l); |
265 l->append(","); | 269 l->append(","); |
266 LogParam(p.request_start_time, l); | 270 LogParam(p.request_start_time, l); |
(...skipping 14 matching lines...) Expand all Loading... |
281 l->append(", "); | 285 l->append(", "); |
282 LogParam(p.connect_timing.ssl_start, l); | 286 LogParam(p.connect_timing.ssl_start, l); |
283 l->append(", "); | 287 l->append(", "); |
284 LogParam(p.connect_timing.ssl_end, l); | 288 LogParam(p.connect_timing.ssl_end, l); |
285 l->append(", "); | 289 l->append(", "); |
286 LogParam(p.send_start, l); | 290 LogParam(p.send_start, l); |
287 l->append(", "); | 291 l->append(", "); |
288 LogParam(p.send_end, l); | 292 LogParam(p.send_end, l); |
289 l->append(", "); | 293 l->append(", "); |
290 LogParam(p.receive_headers_end, l); | 294 LogParam(p.receive_headers_end, l); |
| 295 l->append(", "); |
| 296 LogParam(p.push_start, l); |
| 297 l->append(", "); |
| 298 LogParam(p.push_end, l); |
291 l->append(")"); | 299 l->append(")"); |
292 } | 300 } |
293 | 301 |
294 void ParamTraits<scoped_refptr<content::ResourceRequestBody>>::Write( | 302 void ParamTraits<scoped_refptr<content::ResourceRequestBody>>::Write( |
295 base::Pickle* m, | 303 base::Pickle* m, |
296 const param_type& p) { | 304 const param_type& p) { |
297 WriteParam(m, p.get() != NULL); | 305 WriteParam(m, p.get() != NULL); |
298 if (p.get()) { | 306 if (p.get()) { |
299 WriteParam(m, *p->elements()); | 307 WriteParam(m, *p->elements()); |
300 WriteParam(m, p->identifier()); | 308 WriteParam(m, p->identifier()); |
(...skipping 20 matching lines...) Expand all Loading... |
321 (*r)->set_identifier(identifier); | 329 (*r)->set_identifier(identifier); |
322 return true; | 330 return true; |
323 } | 331 } |
324 | 332 |
325 void ParamTraits<scoped_refptr<content::ResourceRequestBody> >::Log( | 333 void ParamTraits<scoped_refptr<content::ResourceRequestBody> >::Log( |
326 const param_type& p, std::string* l) { | 334 const param_type& p, std::string* l) { |
327 l->append("<ResourceRequestBody>"); | 335 l->append("<ResourceRequestBody>"); |
328 } | 336 } |
329 | 337 |
330 } // namespace IPC | 338 } // namespace IPC |
OLD | NEW |