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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
184 WriteParam(m, p.request_start_time); | 184 WriteParam(m, p.request_start_time); |
185 WriteParam(m, p.request_start); | 185 WriteParam(m, p.request_start); |
186 WriteParam(m, p.proxy_resolve_start); | 186 WriteParam(m, p.proxy_resolve_start); |
187 WriteParam(m, p.proxy_resolve_end); | 187 WriteParam(m, p.proxy_resolve_end); |
188 WriteParam(m, p.connect_timing.dns_start); | 188 WriteParam(m, p.connect_timing.dns_start); |
189 WriteParam(m, p.connect_timing.dns_end); | 189 WriteParam(m, p.connect_timing.dns_end); |
190 WriteParam(m, p.connect_timing.connect_start); | 190 WriteParam(m, p.connect_timing.connect_start); |
191 WriteParam(m, p.connect_timing.connect_end); | 191 WriteParam(m, p.connect_timing.connect_end); |
192 WriteParam(m, p.connect_timing.ssl_start); | 192 WriteParam(m, p.connect_timing.ssl_start); |
193 WriteParam(m, p.connect_timing.ssl_end); | 193 WriteParam(m, p.connect_timing.ssl_end); |
| 194 WriteParam(m, p.serviceworker_timing.fetch_start); |
| 195 WriteParam(m, p.serviceworker_timing.fetch_ready); |
| 196 WriteParam(m, p.serviceworker_timing.fetch_end); |
194 WriteParam(m, p.send_start); | 197 WriteParam(m, p.send_start); |
195 WriteParam(m, p.send_end); | 198 WriteParam(m, p.send_end); |
196 WriteParam(m, p.receive_headers_end); | 199 WriteParam(m, p.receive_headers_end); |
197 } | 200 } |
198 | 201 |
199 bool ParamTraits<net::LoadTimingInfo>::Read( | 202 bool ParamTraits<net::LoadTimingInfo>::Read( |
200 const Message* m, PickleIterator* iter, param_type* r) { | 203 const Message* m, PickleIterator* iter, param_type* r) { |
201 bool has_no_times; | 204 bool has_no_times; |
202 if (!ReadParam(m, iter, &r->socket_log_id) || | 205 if (!ReadParam(m, iter, &r->socket_log_id) || |
203 !ReadParam(m, iter, &r->socket_reused) || | 206 !ReadParam(m, iter, &r->socket_reused) || |
204 !ReadParam(m, iter, &has_no_times)) { | 207 !ReadParam(m, iter, &has_no_times)) { |
205 return false; | 208 return false; |
206 } | 209 } |
207 if (has_no_times) | 210 if (has_no_times) |
208 return true; | 211 return true; |
209 | 212 |
210 return | 213 return |
211 ReadParam(m, iter, &r->request_start_time) && | 214 ReadParam(m, iter, &r->request_start_time) && |
212 ReadParam(m, iter, &r->request_start) && | 215 ReadParam(m, iter, &r->request_start) && |
213 ReadParam(m, iter, &r->proxy_resolve_start) && | 216 ReadParam(m, iter, &r->proxy_resolve_start) && |
214 ReadParam(m, iter, &r->proxy_resolve_end) && | 217 ReadParam(m, iter, &r->proxy_resolve_end) && |
215 ReadParam(m, iter, &r->connect_timing.dns_start) && | 218 ReadParam(m, iter, &r->connect_timing.dns_start) && |
216 ReadParam(m, iter, &r->connect_timing.dns_end) && | 219 ReadParam(m, iter, &r->connect_timing.dns_end) && |
217 ReadParam(m, iter, &r->connect_timing.connect_start) && | 220 ReadParam(m, iter, &r->connect_timing.connect_start) && |
218 ReadParam(m, iter, &r->connect_timing.connect_end) && | 221 ReadParam(m, iter, &r->connect_timing.connect_end) && |
219 ReadParam(m, iter, &r->connect_timing.ssl_start) && | 222 ReadParam(m, iter, &r->connect_timing.ssl_start) && |
220 ReadParam(m, iter, &r->connect_timing.ssl_end) && | 223 ReadParam(m, iter, &r->connect_timing.ssl_end) && |
| 224 ReadParam(m, iter, &r->serviceworker_timing.fetch_start) && |
| 225 ReadParam(m, iter, &r->serviceworker_timing.fetch_ready) && |
| 226 ReadParam(m, iter, &r->serviceworker_timing.fetch_end) && |
221 ReadParam(m, iter, &r->send_start) && | 227 ReadParam(m, iter, &r->send_start) && |
222 ReadParam(m, iter, &r->send_end) && | 228 ReadParam(m, iter, &r->send_end) && |
223 ReadParam(m, iter, &r->receive_headers_end); | 229 ReadParam(m, iter, &r->receive_headers_end); |
224 } | 230 } |
225 | 231 |
226 void ParamTraits<net::LoadTimingInfo>::Log(const param_type& p, | 232 void ParamTraits<net::LoadTimingInfo>::Log(const param_type& p, |
227 std::string* l) { | 233 std::string* l) { |
228 l->append("("); | 234 l->append("("); |
229 LogParam(p.socket_log_id, l); | 235 LogParam(p.socket_log_id, l); |
230 l->append(","); | 236 l->append(","); |
(...skipping 12 matching lines...) Expand all Loading... |
243 LogParam(p.connect_timing.dns_end, l); | 249 LogParam(p.connect_timing.dns_end, l); |
244 l->append(", "); | 250 l->append(", "); |
245 LogParam(p.connect_timing.connect_start, l); | 251 LogParam(p.connect_timing.connect_start, l); |
246 l->append(", "); | 252 l->append(", "); |
247 LogParam(p.connect_timing.connect_end, l); | 253 LogParam(p.connect_timing.connect_end, l); |
248 l->append(", "); | 254 l->append(", "); |
249 LogParam(p.connect_timing.ssl_start, l); | 255 LogParam(p.connect_timing.ssl_start, l); |
250 l->append(", "); | 256 l->append(", "); |
251 LogParam(p.connect_timing.ssl_end, l); | 257 LogParam(p.connect_timing.ssl_end, l); |
252 l->append(", "); | 258 l->append(", "); |
| 259 LogParam(p.serviceworker_timing.fetch_start, l); |
| 260 l->append(", "); |
| 261 LogParam(p.serviceworker_timing.fetch_ready, l); |
| 262 l->append(", "); |
| 263 LogParam(p.serviceworker_timing.fetch_end, l); |
| 264 l->append(", "); |
253 LogParam(p.send_start, l); | 265 LogParam(p.send_start, l); |
254 l->append(", "); | 266 l->append(", "); |
255 LogParam(p.send_end, l); | 267 LogParam(p.send_end, l); |
256 l->append(", "); | 268 l->append(", "); |
257 LogParam(p.receive_headers_end, l); | 269 LogParam(p.receive_headers_end, l); |
258 l->append(")"); | 270 l->append(")"); |
259 } | 271 } |
260 | 272 |
261 void ParamTraits<scoped_refptr<content::ResourceRequestBody> >::Write( | 273 void ParamTraits<scoped_refptr<content::ResourceRequestBody> >::Write( |
262 Message* m, | 274 Message* m, |
(...skipping 25 matching lines...) Expand all Loading... |
288 (*r)->set_identifier(identifier); | 300 (*r)->set_identifier(identifier); |
289 return true; | 301 return true; |
290 } | 302 } |
291 | 303 |
292 void ParamTraits<scoped_refptr<content::ResourceRequestBody> >::Log( | 304 void ParamTraits<scoped_refptr<content::ResourceRequestBody> >::Log( |
293 const param_type& p, std::string* l) { | 305 const param_type& p, std::string* l) { |
294 l->append("<ResourceRequestBody>"); | 306 l->append("<ResourceRequestBody>"); |
295 } | 307 } |
296 | 308 |
297 } // namespace IPC | 309 } // namespace IPC |
OLD | NEW |