third_party/WebKit/Source/devtools/front_end/network/NetworkLogView.js - Issue 2168323002: [DevTools] Explicitly require ResourceTreeModel

Unified Diff: third_party/WebKit/Source/devtools/front_end/network/NetworkLogView.js

Issue 2168323002: [DevTools] Explicitly require ResourceTreeModel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: [DevTools] Explicitly require ResourceTreeModel Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/elements/ComputedStyleModel.js ('k') | third_party/WebKit/Source/devtools/front_end/network/NetworkPanel.js » ('j') | third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 2a52308635591074989e7b54d5773bb16dd5205c..1ebc58a52a3590545eef4cae39a81abb67f59222 100644

--- a/third_party/WebKit/Source/devtools/front_end/network/NetworkLogView.js

+++ b/third_party/WebKit/Source/devtools/front_end/network/NetworkLogView.js

@@ -161,9 +161,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)

@@ -177,9 +180,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);

+ }

}