| 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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 this._preserveLog = preserveLog; | 154 this._preserveLog = preserveLog; |
| 155 }, | 155 }, |
| 156 | 156 |
| 157 /** | 157 /** |
| 158 * @override | 158 * @override |
| 159 * @param {!WebInspector.Target} target | 159 * @param {!WebInspector.Target} target |
| 160 */ | 160 */ |
| 161 targetAdded: function(target) | 161 targetAdded: function(target) |
| 162 { | 162 { |
| 163 if (!target.parentTarget()) { | 163 if (!target.parentTarget()) { |
| 164 target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeM
odel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this); | 164 var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(ta
rget); |
| 165 target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeM
odel.EventTypes.Load, this._loadEventFired, this); | 165 if (resourceTreeModel) { |
| 166 target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeM
odel.EventTypes.DOMContentLoaded, this._domContentLoadedEventFired, this); | 166 resourceTreeModel.addEventListener(WebInspector.ResourceTreeMode
l.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this); |
| 167 resourceTreeModel.addEventListener(WebInspector.ResourceTreeMode
l.EventTypes.Load, this._loadEventFired, this); |
| 168 resourceTreeModel.addEventListener(WebInspector.ResourceTreeMode
l.EventTypes.DOMContentLoaded, this._domContentLoadedEventFired, this); |
| 169 } |
| 167 } | 170 } |
| 168 var networkLog = WebInspector.NetworkLog.fromTarget(target); | 171 var networkLog = WebInspector.NetworkLog.fromTarget(target); |
| 169 if (networkLog) | 172 if (networkLog) |
| 170 networkLog.requests().forEach(this._appendRequest.bind(this)); | 173 networkLog.requests().forEach(this._appendRequest.bind(this)); |
| 171 }, | 174 }, |
| 172 | 175 |
| 173 /** | 176 /** |
| 174 * @override | 177 * @override |
| 175 * @param {!WebInspector.Target} target | 178 * @param {!WebInspector.Target} target |
| 176 */ | 179 */ |
| 177 targetRemoved: function(target) | 180 targetRemoved: function(target) |
| 178 { | 181 { |
| 179 if (!target.parentTarget()) { | 182 if (!target.parentTarget()) { |
| 180 target.resourceTreeModel.removeEventListener(WebInspector.ResourceTr
eeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this); | 183 var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(ta
rget); |
| 181 target.resourceTreeModel.removeEventListener(WebInspector.ResourceTr
eeModel.EventTypes.Load, this._loadEventFired, this); | 184 if (resourceTreeModel) { |
| 182 target.resourceTreeModel.removeEventListener(WebInspector.ResourceTr
eeModel.EventTypes.DOMContentLoaded, this._domContentLoadedEventFired, this); | 185 resourceTreeModel.removeEventListener(WebInspector.ResourceTreeM
odel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this); |
| 186 resourceTreeModel.removeEventListener(WebInspector.ResourceTreeM
odel.EventTypes.Load, this._loadEventFired, this); |
| 187 resourceTreeModel.removeEventListener(WebInspector.ResourceTreeM
odel.EventTypes.DOMContentLoaded, this._domContentLoadedEventFired, this); |
| 188 } |
| 183 } | 189 } |
| 184 }, | 190 }, |
| 185 | 191 |
| 186 /** | 192 /** |
| 187 * @param {number} start | 193 * @param {number} start |
| 188 * @param {number} end | 194 * @param {number} end |
| 189 */ | 195 */ |
| 190 setWindow: function(start, end) | 196 setWindow: function(start, end) |
| 191 { | 197 { |
| 192 if (!start && !end) { | 198 if (!start && !end) { |
| (...skipping 1539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1732 return false; | 1738 return false; |
| 1733 return true; | 1739 return true; |
| 1734 } | 1740 } |
| 1735 | 1741 |
| 1736 WebInspector.NetworkLogView.EventTypes = { | 1742 WebInspector.NetworkLogView.EventTypes = { |
| 1737 RequestSelected: "RequestSelected", | 1743 RequestSelected: "RequestSelected", |
| 1738 SearchCountUpdated: "SearchCountUpdated", | 1744 SearchCountUpdated: "SearchCountUpdated", |
| 1739 SearchIndexUpdated: "SearchIndexUpdated", | 1745 SearchIndexUpdated: "SearchIndexUpdated", |
| 1740 UpdateRequest: "UpdateRequest" | 1746 UpdateRequest: "UpdateRequest" |
| 1741 }; | 1747 }; |
| OLD | NEW |