| Index: third_party/WebKit/Source/devtools/front_end/network/NetworkLogView.js
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/network/NetworkLogView.js b/third_party/WebKit/Source/devtools/front_end/network/NetworkLogView.js
|
| index f1b3451f39c199f8063c9248006bcf7017b3239a..78aec77844ae6c246481a0db319544dc4bec08d1 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/network/NetworkLogView.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/network/NetworkLogView.js
|
| @@ -207,9 +207,12 @@ WebInspector.NetworkLogView.prototype = {
|
| targetAdded: function(target)
|
| {
|
| if (!target.parentTarget()) {
|
| - target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this);
|
| - target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.Load, this._loadEventFired, this);
|
| - target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.DOMContentLoaded, this._domContentLoadedEventFired, this);
|
| + var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(target);
|
| + if (resourceTreeModel) {
|
| + resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this);
|
| + resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.Load, this._loadEventFired, this);
|
| + resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.DOMContentLoaded, this._domContentLoadedEventFired, this);
|
| + }
|
| }
|
| var networkLog = WebInspector.NetworkLog.fromTarget(target);
|
| if (networkLog)
|
| @@ -223,9 +226,12 @@ WebInspector.NetworkLogView.prototype = {
|
| targetRemoved: function(target)
|
| {
|
| if (!target.parentTarget()) {
|
| - target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this);
|
| - target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.Load, this._loadEventFired, this);
|
| - target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.DOMContentLoaded, this._domContentLoadedEventFired, this);
|
| + var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(target);
|
| + if (resourceTreeModel) {
|
| + resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this);
|
| + resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.Load, this._loadEventFired, this);
|
| + resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.DOMContentLoaded, this._domContentLoadedEventFired, this);
|
| + }
|
| }
|
| },
|
|
|
| @@ -732,7 +738,8 @@ WebInspector.NetworkLogView.prototype = {
|
| selectedRequestsNumber++;
|
| selectedTransferSize += requestTransferSize;
|
| }
|
| - if (request.url === request.target().resourceTreeModel.inspectedPageURL() && request.resourceType() === WebInspector.resourceTypes.Document)
|
| + var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(request.target());
|
| + if (request.url === resourceTreeModel.inspectedPageURL() && request.resourceType() === WebInspector.resourceTypes.Document)
|
| baseTime = request.startTime;
|
| if (request.endTime > maxTime)
|
| maxTime = request.endTime;
|
|
|