Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(448)

Side by Side Diff: Source/devtools/front_end/NetworkManager.js

Issue 156623005: Add transfer size paramater to didFinishLoading [3/3] (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Addressed comments Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/PingLoader.h ('k') | Source/devtools/front_end/NetworkRequest.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 { 163 {
164 if (!response) 164 if (!response)
165 return; 165 return;
166 166
167 if (response.url && networkRequest.url !== response.url) 167 if (response.url && networkRequest.url !== response.url)
168 networkRequest.url = response.url; 168 networkRequest.url = response.url;
169 networkRequest.mimeType = response.mimeType; 169 networkRequest.mimeType = response.mimeType;
170 networkRequest.statusCode = response.status; 170 networkRequest.statusCode = response.status;
171 networkRequest.statusText = response.statusText; 171 networkRequest.statusText = response.statusText;
172 networkRequest.responseHeaders = this._headersMapToHeadersArray(response .headers); 172 networkRequest.responseHeaders = this._headersMapToHeadersArray(response .headers);
173 if (response.encodedDataLength >= 0)
174 networkRequest.setTransferSize(response.encodedDataLength);
173 if (response.headersText) 175 if (response.headersText)
174 networkRequest.responseHeadersText = response.headersText; 176 networkRequest.responseHeadersText = response.headersText;
175 if (response.requestHeaders) { 177 if (response.requestHeaders) {
176 networkRequest.setRequestHeaders(this._headersMapToHeadersArray(resp onse.requestHeaders)); 178 networkRequest.setRequestHeaders(this._headersMapToHeadersArray(resp onse.requestHeaders));
177 networkRequest.setRequestHeadersText(response.requestHeadersText || ""); 179 networkRequest.setRequestHeadersText(response.requestHeadersText || "");
178 } 180 }
179 181
180 networkRequest.connectionReused = response.connectionReused; 182 networkRequest.connectionReused = response.connectionReused;
181 networkRequest.connectionId = response.connectionId; 183 networkRequest.connectionId = response.connectionId;
182 if (response.remoteIPAddress) 184 if (response.remoteIPAddress)
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 if (encodedDataLength != -1) 336 if (encodedDataLength != -1)
335 networkRequest.increaseTransferSize(encodedDataLength); 337 networkRequest.increaseTransferSize(encodedDataLength);
336 networkRequest.endTime = time; 338 networkRequest.endTime = time;
337 339
338 this._updateNetworkRequest(networkRequest); 340 this._updateNetworkRequest(networkRequest);
339 }, 341 },
340 342
341 /** 343 /**
342 * @param {!NetworkAgent.RequestId} requestId 344 * @param {!NetworkAgent.RequestId} requestId
343 * @param {!NetworkAgent.Timestamp} finishTime 345 * @param {!NetworkAgent.Timestamp} finishTime
346 * @param {number} encodedDataLength
344 */ 347 */
345 loadingFinished: function(requestId, finishTime) 348 loadingFinished: function(requestId, finishTime, encodedDataLength)
346 { 349 {
347 var networkRequest = this._inflightRequestsById[requestId]; 350 var networkRequest = this._inflightRequestsById[requestId];
348 if (!networkRequest) 351 if (!networkRequest)
349 return; 352 return;
350 this._finishNetworkRequest(networkRequest, finishTime); 353 this._finishNetworkRequest(networkRequest, finishTime, encodedDataLength );
351 }, 354 },
352 355
353 /** 356 /**
354 * @param {!NetworkAgent.RequestId} requestId 357 * @param {!NetworkAgent.RequestId} requestId
355 * @param {!NetworkAgent.Timestamp} time 358 * @param {!NetworkAgent.Timestamp} time
356 * @param {string} localizedDescription 359 * @param {string} localizedDescription
357 * @param {boolean=} canceled 360 * @param {boolean=} canceled
358 */ 361 */
359 loadingFailed: function(requestId, time, localizedDescription, canceled) 362 loadingFailed: function(requestId, time, localizedDescription, canceled)
360 { 363 {
361 var networkRequest = this._inflightRequestsById[requestId]; 364 var networkRequest = this._inflightRequestsById[requestId];
362 if (!networkRequest) 365 if (!networkRequest)
363 return; 366 return;
364 367
365 networkRequest.failed = true; 368 networkRequest.failed = true;
366 networkRequest.canceled = canceled; 369 networkRequest.canceled = canceled;
367 networkRequest.localizedFailDescription = localizedDescription; 370 networkRequest.localizedFailDescription = localizedDescription;
368 this._finishNetworkRequest(networkRequest, time); 371 this._finishNetworkRequest(networkRequest, time, -1);
369 }, 372 },
370 373
371 /** 374 /**
372 * @param {!NetworkAgent.RequestId} requestId 375 * @param {!NetworkAgent.RequestId} requestId
373 * @param {string} requestURL 376 * @param {string} requestURL
374 */ 377 */
375 webSocketCreated: function(requestId, requestURL) 378 webSocketCreated: function(requestId, requestURL)
376 { 379 {
377 var networkRequest = new WebInspector.NetworkRequest(requestId, requestU RL, "", "", ""); 380 var networkRequest = new WebInspector.NetworkRequest(requestId, requestU RL, "", "", "");
378 networkRequest.type = WebInspector.resourceTypes.WebSocket; 381 networkRequest.type = WebInspector.resourceTypes.WebSocket;
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 472
470 /** 473 /**
471 * @param {!NetworkAgent.RequestId} requestId 474 * @param {!NetworkAgent.RequestId} requestId
472 * @param {!NetworkAgent.Timestamp} time 475 * @param {!NetworkAgent.Timestamp} time
473 */ 476 */
474 webSocketClosed: function(requestId, time) 477 webSocketClosed: function(requestId, time)
475 { 478 {
476 var networkRequest = this._inflightRequestsById[requestId]; 479 var networkRequest = this._inflightRequestsById[requestId];
477 if (!networkRequest) 480 if (!networkRequest)
478 return; 481 return;
479 this._finishNetworkRequest(networkRequest, time); 482 this._finishNetworkRequest(networkRequest, time, -1);
480 }, 483 },
481 484
482 /** 485 /**
483 * @param {!NetworkAgent.RequestId} requestId 486 * @param {!NetworkAgent.RequestId} requestId
484 * @param {!NetworkAgent.Timestamp} time 487 * @param {!NetworkAgent.Timestamp} time
485 * @param {string} redirectURL 488 * @param {string} redirectURL
486 * @return {!WebInspector.NetworkRequest} 489 * @return {!WebInspector.NetworkRequest}
487 */ 490 */
488 _appendRedirect: function(requestId, time, redirectURL) 491 _appendRedirect: function(requestId, time, redirectURL)
489 { 492 {
490 var originalNetworkRequest = this._inflightRequestsById[requestId]; 493 var originalNetworkRequest = this._inflightRequestsById[requestId];
491 var previousRedirects = originalNetworkRequest.redirects || []; 494 var previousRedirects = originalNetworkRequest.redirects || [];
492 originalNetworkRequest.requestId = "redirected:" + requestId + "." + pre viousRedirects.length; 495 originalNetworkRequest.requestId = "redirected:" + requestId + "." + pre viousRedirects.length;
493 delete originalNetworkRequest.redirects; 496 delete originalNetworkRequest.redirects;
494 if (previousRedirects.length > 0) 497 if (previousRedirects.length > 0)
495 originalNetworkRequest.redirectSource = previousRedirects[previousRe directs.length - 1]; 498 originalNetworkRequest.redirectSource = previousRedirects[previousRe directs.length - 1];
496 this._finishNetworkRequest(originalNetworkRequest, time); 499 this._finishNetworkRequest(originalNetworkRequest, time, -1);
497 var newNetworkRequest = this._createNetworkRequest(requestId, originalNe tworkRequest.frameId, originalNetworkRequest.loaderId, 500 var newNetworkRequest = this._createNetworkRequest(requestId, originalNe tworkRequest.frameId, originalNetworkRequest.loaderId,
498 redirectURL, originalNetworkRequest.documentURL, originalNetworkReq uest.initiator); 501 redirectURL, originalNetworkRequest.documentURL, originalNetworkReq uest.initiator);
499 newNetworkRequest.redirects = previousRedirects.concat(originalNetworkRe quest); 502 newNetworkRequest.redirects = previousRedirects.concat(originalNetworkRe quest);
500 return newNetworkRequest; 503 return newNetworkRequest;
501 }, 504 },
502 505
503 /** 506 /**
504 * @param {!WebInspector.NetworkRequest} networkRequest 507 * @param {!WebInspector.NetworkRequest} networkRequest
505 */ 508 */
506 _startNetworkRequest: function(networkRequest) 509 _startNetworkRequest: function(networkRequest)
507 { 510 {
508 this._inflightRequestsById[networkRequest.requestId] = networkRequest; 511 this._inflightRequestsById[networkRequest.requestId] = networkRequest;
509 this._inflightRequestsByURL[networkRequest.url] = networkRequest; 512 this._inflightRequestsByURL[networkRequest.url] = networkRequest;
510 this._dispatchEventToListeners(WebInspector.NetworkManager.EventTypes.Re questStarted, networkRequest); 513 this._dispatchEventToListeners(WebInspector.NetworkManager.EventTypes.Re questStarted, networkRequest);
511 }, 514 },
512 515
513 /** 516 /**
514 * @param {!WebInspector.NetworkRequest} networkRequest 517 * @param {!WebInspector.NetworkRequest} networkRequest
515 */ 518 */
516 _updateNetworkRequest: function(networkRequest) 519 _updateNetworkRequest: function(networkRequest)
517 { 520 {
518 this._dispatchEventToListeners(WebInspector.NetworkManager.EventTypes.Re questUpdated, networkRequest); 521 this._dispatchEventToListeners(WebInspector.NetworkManager.EventTypes.Re questUpdated, networkRequest);
519 }, 522 },
520 523
521 /** 524 /**
522 * @param {!WebInspector.NetworkRequest} networkRequest 525 * @param {!WebInspector.NetworkRequest} networkRequest
523 * @param {!NetworkAgent.Timestamp} finishTime 526 * @param {!NetworkAgent.Timestamp} finishTime
527 * @param {number} encodedDataLength
524 */ 528 */
525 _finishNetworkRequest: function(networkRequest, finishTime) 529 _finishNetworkRequest: function(networkRequest, finishTime, encodedDataLengt h)
526 { 530 {
527 networkRequest.endTime = finishTime; 531 networkRequest.endTime = finishTime;
528 networkRequest.finished = true; 532 networkRequest.finished = true;
533 if (encodedDataLength >= 0)
534 networkRequest.setTransferSize(encodedDataLength);
529 this._dispatchEventToListeners(WebInspector.NetworkManager.EventTypes.Re questFinished, networkRequest); 535 this._dispatchEventToListeners(WebInspector.NetworkManager.EventTypes.Re questFinished, networkRequest);
530 delete this._inflightRequestsById[networkRequest.requestId]; 536 delete this._inflightRequestsById[networkRequest.requestId];
531 delete this._inflightRequestsByURL[networkRequest.url]; 537 delete this._inflightRequestsByURL[networkRequest.url];
532 }, 538 },
533 539
534 /** 540 /**
535 * @param {string} eventType 541 * @param {string} eventType
536 * @param {!WebInspector.NetworkRequest} networkRequest 542 * @param {!WebInspector.NetworkRequest} networkRequest
537 */ 543 */
538 _dispatchEventToListeners: function(eventType, networkRequest) 544 _dispatchEventToListeners: function(eventType, networkRequest)
(...skipping 14 matching lines...) Expand all
553 var networkRequest = new WebInspector.NetworkRequest(requestId, url, doc umentURL, frameId, loaderId); 559 var networkRequest = new WebInspector.NetworkRequest(requestId, url, doc umentURL, frameId, loaderId);
554 networkRequest.initiator = initiator; 560 networkRequest.initiator = initiator;
555 return networkRequest; 561 return networkRequest;
556 } 562 }
557 } 563 }
558 564
559 /** 565 /**
560 * @type {!WebInspector.NetworkManager} 566 * @type {!WebInspector.NetworkManager}
561 */ 567 */
562 WebInspector.networkManager; 568 WebInspector.networkManager;
OLDNEW
« no previous file with comments | « Source/core/loader/PingLoader.h ('k') | Source/devtools/front_end/NetworkRequest.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698