| 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 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 this._preserveLog = preserveLog; | 200 this._preserveLog = preserveLog; |
| 201 }, | 201 }, |
| 202 | 202 |
| 203 /** | 203 /** |
| 204 * @override | 204 * @override |
| 205 * @param {!WebInspector.Target} target | 205 * @param {!WebInspector.Target} target |
| 206 */ | 206 */ |
| 207 targetAdded: function(target) | 207 targetAdded: function(target) |
| 208 { | 208 { |
| 209 if (!target.parentTarget()) { | 209 if (!target.parentTarget()) { |
| 210 target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeM
odel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this); | 210 var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(ta
rget); |
| 211 target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeM
odel.EventTypes.Load, this._loadEventFired, this); | 211 if (resourceTreeModel) { |
| 212 target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeM
odel.EventTypes.DOMContentLoaded, this._domContentLoadedEventFired, this); | 212 resourceTreeModel.addEventListener(WebInspector.ResourceTreeMode
l.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this); |
| 213 resourceTreeModel.addEventListener(WebInspector.ResourceTreeMode
l.EventTypes.Load, this._loadEventFired, this); |
| 214 resourceTreeModel.addEventListener(WebInspector.ResourceTreeMode
l.EventTypes.DOMContentLoaded, this._domContentLoadedEventFired, this); |
| 215 } |
| 213 } | 216 } |
| 214 var networkLog = WebInspector.NetworkLog.fromTarget(target); | 217 var networkLog = WebInspector.NetworkLog.fromTarget(target); |
| 215 if (networkLog) | 218 if (networkLog) |
| 216 networkLog.requests().forEach(this._appendRequest.bind(this)); | 219 networkLog.requests().forEach(this._appendRequest.bind(this)); |
| 217 }, | 220 }, |
| 218 | 221 |
| 219 /** | 222 /** |
| 220 * @override | 223 * @override |
| 221 * @param {!WebInspector.Target} target | 224 * @param {!WebInspector.Target} target |
| 222 */ | 225 */ |
| 223 targetRemoved: function(target) | 226 targetRemoved: function(target) |
| 224 { | 227 { |
| 225 if (!target.parentTarget()) { | 228 if (!target.parentTarget()) { |
| 226 target.resourceTreeModel.removeEventListener(WebInspector.ResourceTr
eeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this); | 229 var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(ta
rget); |
| 227 target.resourceTreeModel.removeEventListener(WebInspector.ResourceTr
eeModel.EventTypes.Load, this._loadEventFired, this); | 230 if (resourceTreeModel) { |
| 228 target.resourceTreeModel.removeEventListener(WebInspector.ResourceTr
eeModel.EventTypes.DOMContentLoaded, this._domContentLoadedEventFired, this); | 231 resourceTreeModel.removeEventListener(WebInspector.ResourceTreeM
odel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this); |
| 232 resourceTreeModel.removeEventListener(WebInspector.ResourceTreeM
odel.EventTypes.Load, this._loadEventFired, this); |
| 233 resourceTreeModel.removeEventListener(WebInspector.ResourceTreeM
odel.EventTypes.DOMContentLoaded, this._domContentLoadedEventFired, this); |
| 234 } |
| 229 } | 235 } |
| 230 }, | 236 }, |
| 231 | 237 |
| 232 /** | 238 /** |
| 233 * @param {number} start | 239 * @param {number} start |
| 234 * @param {number} end | 240 * @param {number} end |
| 235 */ | 241 */ |
| 236 setWindow: function(start, end) | 242 setWindow: function(start, end) |
| 237 { | 243 { |
| 238 if (!start && !end) { | 244 if (!start && !end) { |
| (...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 725 var maxTime = -1; | 731 var maxTime = -1; |
| 726 var nodes = this._nodesByRequestId.valuesArray(); | 732 var nodes = this._nodesByRequestId.valuesArray(); |
| 727 for (var i = 0; i < nodes.length; ++i) { | 733 for (var i = 0; i < nodes.length; ++i) { |
| 728 var request = nodes[i].request(); | 734 var request = nodes[i].request(); |
| 729 var requestTransferSize = request.transferSize; | 735 var requestTransferSize = request.transferSize; |
| 730 transferSize += requestTransferSize; | 736 transferSize += requestTransferSize; |
| 731 if (!nodes[i][WebInspector.NetworkLogView._isFilteredOutSymbol]) { | 737 if (!nodes[i][WebInspector.NetworkLogView._isFilteredOutSymbol]) { |
| 732 selectedRequestsNumber++; | 738 selectedRequestsNumber++; |
| 733 selectedTransferSize += requestTransferSize; | 739 selectedTransferSize += requestTransferSize; |
| 734 } | 740 } |
| 735 if (request.url === request.target().resourceTreeModel.inspectedPage
URL() && request.resourceType() === WebInspector.resourceTypes.Document) | 741 var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(re
quest.target()); |
| 742 if (request.url === resourceTreeModel.inspectedPageURL() && request.
resourceType() === WebInspector.resourceTypes.Document) |
| 736 baseTime = request.startTime; | 743 baseTime = request.startTime; |
| 737 if (request.endTime > maxTime) | 744 if (request.endTime > maxTime) |
| 738 maxTime = request.endTime; | 745 maxTime = request.endTime; |
| 739 } | 746 } |
| 740 | 747 |
| 741 var summaryBar = this._summaryBarElement; | 748 var summaryBar = this._summaryBarElement; |
| 742 summaryBar.removeChildren(); | 749 summaryBar.removeChildren(); |
| 743 var separator = "\u2002\u2758\u2002"; | 750 var separator = "\u2002\u2758\u2002"; |
| 744 var text = ""; | 751 var text = ""; |
| 745 /** | 752 /** |
| (...skipping 1447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2193 return false; | 2200 return false; |
| 2194 return true; | 2201 return true; |
| 2195 } | 2202 } |
| 2196 | 2203 |
| 2197 WebInspector.NetworkLogView.EventTypes = { | 2204 WebInspector.NetworkLogView.EventTypes = { |
| 2198 RequestSelected: "RequestSelected", | 2205 RequestSelected: "RequestSelected", |
| 2199 SearchCountUpdated: "SearchCountUpdated", | 2206 SearchCountUpdated: "SearchCountUpdated", |
| 2200 SearchIndexUpdated: "SearchIndexUpdated", | 2207 SearchIndexUpdated: "SearchIndexUpdated", |
| 2201 UpdateRequest: "UpdateRequest" | 2208 UpdateRequest: "UpdateRequest" |
| 2202 }; | 2209 }; |
| OLD | NEW |