[DevTools] Make resource tree model optional

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

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 60 matching lines @@
  */
 WebInspector.NetworkProject = function(target, workspace, networkMapping)
 {
     WebInspector.SDKObject.call(this, target);
     this._workspace = workspace;
     this._networkMapping = networkMapping;
     /** @type {!Map<string, !WebInspector.ContentProviderBasedProject>} */
     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) {
         debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.ParsedScriptSource, this._parsedScriptSource, this);
         debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.FailedToParseScriptSource, this._parsedScriptSource, this);
     }
     var cssModel = WebInspector.CSSModel.fromTarget(target);
     if (cssModel) {
         cssModel.addEventListener(WebInspector.CSSModel.Events.StyleSheetAdded, this._styleSheetAdded, this);
         cssModel.addEventListener(WebInspector.CSSModel.Events.StyleSheetRemoved, this._styleSheetRemoved, this);
@@ skipping 96 matching lines @@
         if (header)
             frameId = header.frameId;
     }
 
     if (!frameId) {
         var resource = uiSourceCode[WebInspector.NetworkProject._resourceSymbol];
         if (resource)
             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 = {
     /**
      * @param {?WebInspector.ResourceTreeFrame} frame
      * @param {boolean} isContentScripts
      * @return {!WebInspector.ContentProviderBasedProject}
      */
     _workspaceProject: function(frame, isContentScripts)
     {
@@ skipping 46 matching lines @@
         function populateFrame(frame)
         {
             for (var i = 0; i < frame.childFrames.length; ++i)
                 populateFrame.call(this, frame.childFrames[i]);
 
             var resources = frame.resources();
             for (var i = 0; i < resources.length; ++i)
                 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);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {!WebInspector.ContentProvider} contentProvider
      */
     _addUISourceCodeWithProvider: function(uiSourceCode, contentProvider)
     {
@@ skipping 138 matching lines @@
         var project = this._workspaceProject(frame, isContentScript);
         var uiSourceCode = project.createUISourceCode(url, contentProvider.contentType());
         uiSourceCode[WebInspector.NetworkProject._targetSymbol] = this.target();
         return uiSourceCode;
     },
 
     _dispose: function()
     {
         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);
             debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.FailedToParseScriptSource, this._parsedScriptSource, this);
         }
         var cssModel = WebInspector.CSSModel.fromTarget(target);
         if (cssModel) {
             cssModel.removeEventListener(WebInspector.CSSModel.Events.StyleSheetAdded, this._styleSheetAdded, this);
             cssModel.removeEventListener(WebInspector.CSSModel.Events.StyleSheetRemoved, this._styleSheetRemoved, this);
         }
         delete target[WebInspector.NetworkProject._networkProjectSymbol];
     },
 
     _reset: function()
     {
         for (var project of this._workspaceProjects.values())
             project.reset();
         this._workspaceProjects.clear();
     },
 
     __proto__: WebInspector.SDKObject.prototype
 }