| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2008, 2009 Anthony Ricaud <rik@webkit.org> | 3 * Copyright (C) 2008, 2009 Anthony Ricaud <rik@webkit.org> |
| 4 * Copyright (C) 2011 Google Inc. All rights reserved. | 4 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * | 9 * |
| 10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY | 22 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY |
| 23 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 23 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
| 24 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 24 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
| 25 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 25 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
| 26 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 /** | 30 /** |
| 31 * @implements {UI.Searchable} | 31 * @implements {UI.Searchable} |
| 32 * @implements {SDK.TargetManager.Observer} | 32 * @implements {SDK.SDKModelObserver<!SDK.NetworkManager>} |
| 33 * @unrestricted | 33 * @unrestricted |
| 34 */ | 34 */ |
| 35 Network.NetworkLogView = class extends UI.VBox { | 35 Network.NetworkLogView = class extends UI.VBox { |
| 36 /** | 36 /** |
| 37 * @param {!UI.FilterBar} filterBar | 37 * @param {!UI.FilterBar} filterBar |
| 38 * @param {!Element} progressBarContainer | 38 * @param {!Element} progressBarContainer |
| 39 * @param {!Common.Setting} networkLogLargeRowsSetting | 39 * @param {!Common.Setting} networkLogLargeRowsSetting |
| 40 */ | 40 */ |
| 41 constructor(filterBar, progressBarContainer, networkLogLargeRowsSetting) { | 41 constructor(filterBar, progressBarContainer, networkLogLargeRowsSetting) { |
| 42 super(); | 42 super(); |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 | 103 |
| 104 this._headerHeight = 0; | 104 this._headerHeight = 0; |
| 105 | 105 |
| 106 this._addFilters(); | 106 this._addFilters(); |
| 107 this._resetSuggestionBuilder(); | 107 this._resetSuggestionBuilder(); |
| 108 this._initializeView(); | 108 this._initializeView(); |
| 109 | 109 |
| 110 Common.moduleSetting('networkColorCodeResourceTypes') | 110 Common.moduleSetting('networkColorCodeResourceTypes') |
| 111 .addChangeListener(this._invalidateAllItems.bind(this, false), this); | 111 .addChangeListener(this._invalidateAllItems.bind(this, false), this); |
| 112 | 112 |
| 113 SDK.targetManager.observeTargets(this); | 113 SDK.targetManager.observeModels(SDK.NetworkManager, this); |
| 114 SDK.targetManager.addModelListener( | 114 SDK.targetManager.addModelListener( |
| 115 SDK.NetworkManager, SDK.NetworkManager.Events.RequestStarted, this._onRe
questStarted, this); | 115 SDK.NetworkManager, SDK.NetworkManager.Events.RequestStarted, this._onRe
questStarted, this); |
| 116 SDK.targetManager.addModelListener( | 116 SDK.targetManager.addModelListener( |
| 117 SDK.NetworkManager, SDK.NetworkManager.Events.RequestUpdated, this._onRe
questUpdated, this); | 117 SDK.NetworkManager, SDK.NetworkManager.Events.RequestUpdated, this._onRe
questUpdated, this); |
| 118 SDK.targetManager.addModelListener( | 118 SDK.targetManager.addModelListener( |
| 119 SDK.NetworkManager, SDK.NetworkManager.Events.RequestFinished, this._onR
equestUpdated, this); | 119 SDK.NetworkManager, SDK.NetworkManager.Events.RequestFinished, this._onR
equestUpdated, this); |
| 120 } | 120 } |
| 121 | 121 |
| 122 /** | 122 /** |
| 123 * @param {!Network.NetworkLogView.Filter} filter | 123 * @param {!Network.NetworkLogView.Filter} filter |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 382 | 382 |
| 383 /** | 383 /** |
| 384 * @param {boolean} preserveLog | 384 * @param {boolean} preserveLog |
| 385 */ | 385 */ |
| 386 setPreserveLog(preserveLog) { | 386 setPreserveLog(preserveLog) { |
| 387 this._preserveLog = preserveLog; | 387 this._preserveLog = preserveLog; |
| 388 } | 388 } |
| 389 | 389 |
| 390 /** | 390 /** |
| 391 * @override | 391 * @override |
| 392 * @param {!SDK.Target} target | 392 * @param {!SDK.NetworkManager} networkManager |
| 393 */ | 393 */ |
| 394 targetAdded(target) { | 394 modelAdded(networkManager) { |
| 395 if (!target.parentTarget()) { | 395 if (!networkManager.target().parentTarget()) { |
| 396 var resourceTreeModel = target.model(SDK.ResourceTreeModel); | 396 var resourceTreeModel = networkManager.target().model(SDK.ResourceTreeMode
l); |
| 397 if (resourceTreeModel) { | 397 if (resourceTreeModel) { |
| 398 resourceTreeModel.addEventListener( | 398 resourceTreeModel.addEventListener( |
| 399 SDK.ResourceTreeModel.Events.MainFrameNavigated, this._mainFrameNavi
gated, this); | 399 SDK.ResourceTreeModel.Events.MainFrameNavigated, this._mainFrameNavi
gated, this); |
| 400 resourceTreeModel.addEventListener(SDK.ResourceTreeModel.Events.Load, th
is._loadEventFired, this); | 400 resourceTreeModel.addEventListener(SDK.ResourceTreeModel.Events.Load, th
is._loadEventFired, this); |
| 401 resourceTreeModel.addEventListener( | 401 resourceTreeModel.addEventListener( |
| 402 SDK.ResourceTreeModel.Events.DOMContentLoaded, this._domContentLoade
dEventFired, this); | 402 SDK.ResourceTreeModel.Events.DOMContentLoaded, this._domContentLoade
dEventFired, this); |
| 403 } | 403 } |
| 404 } | 404 } |
| 405 NetworkLog.networkLog.requestsForTarget(target).forEach(this._appendRequest.
bind(this)); | 405 NetworkLog.networkLog.requestsForManager(networkManager).forEach(this._appen
dRequest.bind(this)); |
| 406 } | 406 } |
| 407 | 407 |
| 408 /** | 408 /** |
| 409 * @override | 409 * @override |
| 410 * @param {!SDK.Target} target | 410 * @param {!SDK.NetworkManager} networkManager |
| 411 */ | 411 */ |
| 412 targetRemoved(target) { | 412 modelRemoved(networkManager) { |
| 413 if (!target.parentTarget()) { | 413 if (!networkManager.target().parentTarget()) { |
| 414 var resourceTreeModel = target.model(SDK.ResourceTreeModel); | 414 var resourceTreeModel = networkManager.target().model(SDK.ResourceTreeMode
l); |
| 415 if (resourceTreeModel) { | 415 if (resourceTreeModel) { |
| 416 resourceTreeModel.removeEventListener( | 416 resourceTreeModel.removeEventListener( |
| 417 SDK.ResourceTreeModel.Events.MainFrameNavigated, this._mainFrameNavi
gated, this); | 417 SDK.ResourceTreeModel.Events.MainFrameNavigated, this._mainFrameNavi
gated, this); |
| 418 resourceTreeModel.removeEventListener(SDK.ResourceTreeModel.Events.Load,
this._loadEventFired, this); | 418 resourceTreeModel.removeEventListener(SDK.ResourceTreeModel.Events.Load,
this._loadEventFired, this); |
| 419 resourceTreeModel.removeEventListener( | 419 resourceTreeModel.removeEventListener( |
| 420 SDK.ResourceTreeModel.Events.DOMContentLoaded, this._domContentLoade
dEventFired, this); | 420 SDK.ResourceTreeModel.Events.DOMContentLoaded, this._domContentLoade
dEventFired, this); |
| 421 } | 421 } |
| 422 } | 422 } |
| 423 } | 423 } |
| 424 | 424 |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 598 var maxTime = -1; | 598 var maxTime = -1; |
| 599 var nodes = this._nodesByRequestId.valuesArray(); | 599 var nodes = this._nodesByRequestId.valuesArray(); |
| 600 for (var i = 0; i < nodes.length; ++i) { | 600 for (var i = 0; i < nodes.length; ++i) { |
| 601 var request = nodes[i].request(); | 601 var request = nodes[i].request(); |
| 602 var requestTransferSize = request.transferSize; | 602 var requestTransferSize = request.transferSize; |
| 603 transferSize += requestTransferSize; | 603 transferSize += requestTransferSize; |
| 604 if (!nodes[i][Network.NetworkLogView._isFilteredOutSymbol]) { | 604 if (!nodes[i][Network.NetworkLogView._isFilteredOutSymbol]) { |
| 605 selectedRequestsNumber++; | 605 selectedRequestsNumber++; |
| 606 selectedTransferSize += requestTransferSize; | 606 selectedTransferSize += requestTransferSize; |
| 607 } | 607 } |
| 608 if (request.url() === request.target().inspectedURL() && request.resourceT
ype() === Common.resourceTypes.Document) | 608 if (request.url() === request.networkManager().target().inspectedURL() && |
| 609 request.resourceType() === Common.resourceTypes.Document) |
| 609 baseTime = request.startTime; | 610 baseTime = request.startTime; |
| 610 if (request.endTime > maxTime) | 611 if (request.endTime > maxTime) |
| 611 maxTime = request.endTime; | 612 maxTime = request.endTime; |
| 612 } | 613 } |
| 613 | 614 |
| 614 var summaryBar = this._summaryBarElement; | 615 var summaryBar = this._summaryBarElement; |
| 615 summaryBar.removeChildren(); | 616 summaryBar.removeChildren(); |
| 616 var separator = '\u2002\u2758\u2002'; | 617 var separator = '\u2002\u2758\u2002'; |
| 617 var text = ''; | 618 var text = ''; |
| 618 /** | 619 /** |
| (...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1031 */ | 1032 */ |
| 1032 _mainFrameNavigated(event) { | 1033 _mainFrameNavigated(event) { |
| 1033 if (!this._recording) | 1034 if (!this._recording) |
| 1034 return; | 1035 return; |
| 1035 | 1036 |
| 1036 var frame = /** @type {!SDK.ResourceTreeFrame} */ (event.data); | 1037 var frame = /** @type {!SDK.ResourceTreeFrame} */ (event.data); |
| 1037 var loaderId = frame.loaderId; | 1038 var loaderId = frame.loaderId; |
| 1038 | 1039 |
| 1039 // Pick provisional load requests. | 1040 // Pick provisional load requests. |
| 1040 var requestsToPick = []; | 1041 var requestsToPick = []; |
| 1041 var requests = NetworkLog.networkLog.requestsForTarget(frame.target()); | 1042 var networkManager = frame.resourceTreeModel().target().model(SDK.NetworkMan
ager); |
| 1043 var requests = networkManager ? NetworkLog.networkLog.requestsForManager(net
workManager) : []; |
| 1042 for (var i = 0; i < requests.length; ++i) { | 1044 for (var i = 0; i < requests.length; ++i) { |
| 1043 var request = requests[i]; | 1045 var request = requests[i]; |
| 1044 if (request.loaderId === loaderId) | 1046 if (request.loaderId === loaderId) |
| 1045 requestsToPick.push(request); | 1047 requestsToPick.push(request); |
| 1046 } | 1048 } |
| 1047 | 1049 |
| 1048 if (!this._preserveLog) { | 1050 if (!this._preserveLog) { |
| 1049 this.reset(); | 1051 this.reset(); |
| 1050 for (var i = 0; i < requestsToPick.length; ++i) | 1052 for (var i = 0; i < requestsToPick.length; ++i) |
| 1051 this._appendRequest(requestsToPick[i]); | 1053 this._appendRequest(requestsToPick[i]); |
| (...skipping 757 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1809 * @return {?*} | 1811 * @return {?*} |
| 1810 */ | 1812 */ |
| 1811 groupForRequest(request) {}, | 1813 groupForRequest(request) {}, |
| 1812 | 1814 |
| 1813 /** | 1815 /** |
| 1814 * @param {!*} key | 1816 * @param {!*} key |
| 1815 * @return {string} | 1817 * @return {string} |
| 1816 */ | 1818 */ |
| 1817 groupName(key) {} | 1819 groupName(key) {} |
| 1818 }; | 1820 }; |
| OLD | NEW |