[DevTools] Make resource tree model optional

third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js

Index: third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js
diff --git a/third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js b/third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js
index 6adf7e31a578bbc5d979d662f98fe60959fbdd9b..b239628846a5539f860e59132b7ddb32022aea0e 100644
--- a/third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js
+++ b/third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js
@@ -78,9 +78,12 @@ WebInspector.NetworkProject = function(target, workspace, networkMapping)
     this._workspaceProjects = new Map();
     target[WebInspector.NetworkProject._networkProjectSymbol] = this;
 
-    target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this);
-    target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameWillNavigate, this._frameWillNavigate, this);
-    target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this);
+    var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(target);
+    if (resourceTreeModel) {
+        resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this);
+        resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameWillNavigate, this._frameWillNavigate, this);
+        resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this);
+    }
 
     var debuggerModel = WebInspector.DebuggerModel.fromTarget(target);
     if (debuggerModel) {
@@ -197,7 +200,8 @@ WebInspector.NetworkProject.uiSourceCodeFrame = function(uiSourceCode)
             frameId = resource.frameId;
     }
 
-    return frameId ? target.resourceTreeModel.frameForId(frameId) : null;
+    var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(target);
+    return (frameId && resourceTreeModel) ? resourceTreeModel.frameForId(frameId) : null;

[pfeldman, 2016/07/07 17:44:13]

If we have frameId, we should have resourceTreeModel, no need to check.

[eostroukhov-old, 2016/07/13 23:30:58]

I deleted the whole method, it was not used.

 }
 
 WebInspector.NetworkProject.prototype = {
@@ -264,7 +268,8 @@ WebInspector.NetworkProject.prototype = {
                 this._addResource(resources[i]);
         }
 
-        var mainFrame = this.target().resourceTreeModel.mainFrame;
+        var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(this.target());
+        var mainFrame = resourceTreeModel && resourceTreeModel.mainFrame;
         if (mainFrame)
             populateFrame.call(this, mainFrame);
     },
@@ -423,8 +428,11 @@ WebInspector.NetworkProject.prototype = {
     {
         this._reset();
         var target = this.target();
-        target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this);
-        target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this);
+        var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(target);
+        if (resourceTreeModel) {
+            resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this);

[pfeldman, 2016/07/07 17:44:14]

We added 3 listeners, but removed 2 - something is wrong!

[eostroukhov-old, 2016/07/13 23:30:58]

Done.

+            resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this);
+        }
         var debuggerModel = WebInspector.DebuggerModel.fromTarget(target);
         if (debuggerModel) {
             debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.ParsedScriptSource, this._parsedScriptSource, this);