[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..fe5accd010baf355bbd9f97efb5a14e51d6b9a34 100644
--- a/third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js
+++ b/third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js
@@ -49,7 +49,7 @@ WebInspector.NetworkProjectManager.prototype = {
      */
     targetAdded: function(target)
     {
-        new WebInspector.NetworkProject(target, this._workspace, this._networkMapping);
+        new WebInspector.NetworkProject(target, this._workspace, this._networkMapping, WebInspector.ResourceTreeModel.fromTarget(target));
     },
 
     /**
@@ -68,19 +68,23 @@ WebInspector.NetworkProjectManager.prototype = {
  * @param {!WebInspector.Target} target
  * @param {!WebInspector.Workspace} workspace
  * @param {!WebInspector.NetworkMapping} networkMapping
+ * @param {?WebInspector.ResourceTreeModel} resourceTreeModel
  */
-WebInspector.NetworkProject = function(target, workspace, networkMapping)
+WebInspector.NetworkProject = function(target, workspace, networkMapping, resourceTreeModel)
 {
     WebInspector.SDKObject.call(this, target);
     this._workspace = workspace;
     this._networkMapping = networkMapping;
     /** @type {!Map<string, !WebInspector.ContentProviderBasedProject>} */
     this._workspaceProjects = new Map();
+    this._resourceTreeModel = resourceTreeModel;
     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);
+    if (resourceTreeModel) {

[dgozman, 2016/08/19 20:23:37]

Let's make sure we have service worker script in the navigator.

[eostroukhov, 2016/08/20 01:22:30]

I see the service worker in the view. It is added as a result of the "script
parsed" notification.

+        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) {
@@ -166,40 +170,6 @@ WebInspector.NetworkProject.uiSourceCodeMimeType = function(uiSourceCode)
     return mimeType || uiSourceCode.contentType().canonicalMimeType();
 }
 
-/**
- * @param {!WebInspector.UISourceCode} uiSourceCode
- * @return {?WebInspector.ResourceTreeFrame}
- */
-WebInspector.NetworkProject.uiSourceCodeFrame = function(uiSourceCode)
-{
-    var target = uiSourceCode[WebInspector.NetworkProject._targetSymbol];
-    if (!target)
-        return null;
-
-    var frameId;
-
-    var script = uiSourceCode[WebInspector.NetworkProject._scriptSymbol];
-    if (script) {
-        var executionContext = script.executionContext();
-        if (executionContext)
-            frameId = executionContext.frameId;
-    }
-
-    if (!frameId) {
-        var header = uiSourceCode[WebInspector.NetworkProject._styleSheetSymbol];
-        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;
-}
-
 WebInspector.NetworkProject.prototype = {
     /**
      * @param {?WebInspector.ResourceTreeFrame} frame
@@ -264,7 +234,8 @@ WebInspector.NetworkProject.prototype = {
                 this._addResource(resources[i]);
         }
 
-        var mainFrame = this.target().resourceTreeModel.mainFrame;
+        var resourceTreeModel = this._resourceTreeModel;
+        var mainFrame = resourceTreeModel && resourceTreeModel.mainFrame;
         if (mainFrame)
             populateFrame.call(this, mainFrame);
     },
@@ -422,9 +393,12 @@ WebInspector.NetworkProject.prototype = {
     _dispose: function()
     {
         this._reset();
+        if (this._resourceTreeModel) {
+            this._resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this);

[dgozman, 2016/08/19 20:23:37]

nit: while you are here, let's migrate to
WebInspector.EventTarget.removeEventListeners.

[eostroukhov, 2016/08/20 01:22:30]

Done.

+            this._resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameWillNavigate, this._frameWillNavigate, this);
+            this._resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this);
+        }
         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 debuggerModel = WebInspector.DebuggerModel.fromTarget(target);
         if (debuggerModel) {
             debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.ParsedScriptSource, this._parsedScriptSource, this);