| 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 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeM
odel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this); |
| 211 target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeM
odel.EventTypes.Load, this._loadEventFired, this); | 211 target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeM
odel.EventTypes.Load, this._loadEventFired, this); |
| 212 target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeM
odel.EventTypes.DOMContentLoaded, this._domContentLoadedEventFired, this); | 212 target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeM
odel.EventTypes.DOMContentLoaded, this._domContentLoadedEventFired, this); |
| 213 } | 213 } |
| 214 target.networkLog.requests().forEach(this._appendRequest.bind(this)); | 214 var networkLog = WebInspector.NetworkLog.fromTarget(target); |
| 215 if (networkLog) |
| 216 networkLog.requests().forEach(this._appendRequest.bind(this)); |
| 215 }, | 217 }, |
| 216 | 218 |
| 217 /** | 219 /** |
| 218 * @override | 220 * @override |
| 219 * @param {!WebInspector.Target} target | 221 * @param {!WebInspector.Target} target |
| 220 */ | 222 */ |
| 221 targetRemoved: function(target) | 223 targetRemoved: function(target) |
| 222 { | 224 { |
| 223 if (!target.parentTarget()) { | 225 if (!target.parentTarget()) { |
| 224 target.resourceTreeModel.removeEventListener(WebInspector.ResourceTr
eeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this); | 226 target.resourceTreeModel.removeEventListener(WebInspector.ResourceTr
eeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this); |
| (...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1159 _mainFrameNavigated: function(event) | 1161 _mainFrameNavigated: function(event) |
| 1160 { | 1162 { |
| 1161 if (!this._recording) | 1163 if (!this._recording) |
| 1162 return; | 1164 return; |
| 1163 | 1165 |
| 1164 var frame = /** @type {!WebInspector.ResourceTreeFrame} */ (event.data); | 1166 var frame = /** @type {!WebInspector.ResourceTreeFrame} */ (event.data); |
| 1165 var loaderId = frame.loaderId; | 1167 var loaderId = frame.loaderId; |
| 1166 | 1168 |
| 1167 // Pick provisional load requests. | 1169 // Pick provisional load requests. |
| 1168 var requestsToPick = []; | 1170 var requestsToPick = []; |
| 1169 var requests = frame.target().networkLog.requests(); | 1171 var networkLog = WebInspector.NetworkLog.fromTarget(frame.target()); |
| 1172 var requests = networkLog ? networkLog.requests() : []; |
| 1170 for (var i = 0; i < requests.length; ++i) { | 1173 for (var i = 0; i < requests.length; ++i) { |
| 1171 var request = requests[i]; | 1174 var request = requests[i]; |
| 1172 if (request.loaderId === loaderId) | 1175 if (request.loaderId === loaderId) |
| 1173 requestsToPick.push(request); | 1176 requestsToPick.push(request); |
| 1174 } | 1177 } |
| 1175 | 1178 |
| 1176 if (!this._preserveLog) { | 1179 if (!this._preserveLog) { |
| 1177 this.reset(); | 1180 this.reset(); |
| 1178 for (var i = 0; i < requestsToPick.length; ++i) | 1181 for (var i = 0; i < requestsToPick.length; ++i) |
| 1179 this._appendRequest(requestsToPick[i]); | 1182 this._appendRequest(requestsToPick[i]); |
| (...skipping 1010 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2190 return false; | 2193 return false; |
| 2191 return true; | 2194 return true; |
| 2192 } | 2195 } |
| 2193 | 2196 |
| 2194 WebInspector.NetworkLogView.EventTypes = { | 2197 WebInspector.NetworkLogView.EventTypes = { |
| 2195 RequestSelected: "RequestSelected", | 2198 RequestSelected: "RequestSelected", |
| 2196 SearchCountUpdated: "SearchCountUpdated", | 2199 SearchCountUpdated: "SearchCountUpdated", |
| 2197 SearchIndexUpdated: "SearchIndexUpdated", | 2200 SearchIndexUpdated: "SearchIndexUpdated", |
| 2198 UpdateRequest: "UpdateRequest" | 2201 UpdateRequest: "UpdateRequest" |
| 2199 }; | 2202 }; |
| OLD | NEW |