[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 31 matching lines @@
     targetManager.observeTargets(this);
 }
 
 WebInspector.NetworkProjectManager.prototype = {
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetAdded: function(target)
     {
-        new WebInspector.NetworkProject(target, this._workspace, this._networkMapping);
+        new WebInspector.NetworkProject(target, this._workspace, this._networkMapping, WebInspector.ResourceTreeModel.fromTarget(target));
     },
 
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetRemoved: function(target)
     {
         WebInspector.NetworkProject.forTarget(target)._dispose();
     }
 }
 
 /**
  * @constructor
  * @extends {WebInspector.SDKObject}
  * @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) {
         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 65 matching lines @@
         uiSourceCode[WebInspector.NetworkProject._styleSheetSymbol]) {
         return uiSourceCode.contentType().canonicalMimeType();
     }
     var resource = uiSourceCode[WebInspector.NetworkProject._resourceSymbol];
     if (resource)
         return resource.mimeType;
     var mimeType = WebInspector.ResourceType.mimeFromURL(uiSourceCode.url());
     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
      * @param {boolean} isContentScripts
      * @return {!WebInspector.ContentProviderBasedProject}
      */
     _workspaceProject: function(frame, isContentScripts)
     {
         var projectId = WebInspector.NetworkProject.projectId(this.target(), frame, isContentScripts);
         var projectType = isContentScripts ? WebInspector.projectTypes.ContentScripts : WebInspector.projectTypes.Network;
@@ skipping 44 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 = this._resourceTreeModel;
+        var mainFrame = resourceTreeModel && resourceTreeModel.mainFrame;
         if (mainFrame)
             populateFrame.call(this, mainFrame);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {!WebInspector.ContentProvider} contentProvider
      */
     _addUISourceCodeWithProvider: function(uiSourceCode, contentProvider)
     {
@@ skipping 137 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();
+        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);
             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
 }