DevTools: proper management of ResourceTreeModel in NetworkProject

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 36f42420e6a097d133a36e2c612047786fce287a..1f239ff1897af9676e62156b13a861e0ab59bcd6 100644
--- a/third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js
+++ b/third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.js
@@ -82,8 +82,6 @@ Bindings.NetworkProject = class {
           resourceTreeModel.addEventListener(SDK.ResourceTreeModel.Events.ResourceAdded, this._resourceAdded, this),
           resourceTreeModel.addEventListener(
               SDK.ResourceTreeModel.Events.FrameWillNavigate, this._frameWillNavigate, this),
-          resourceTreeModel.addEventListener(
-              SDK.ResourceTreeModel.Events.MainFrameNavigated, this._mainFrameNavigated, this),
           resourceTreeModel.addEventListener(SDK.ResourceTreeModel.Events.FrameDetached, this._frameDetached, this));
     }
 
@@ -104,8 +102,6 @@ Bindings.NetworkProject = class {
           cssModel.addEventListener(SDK.CSSModel.Events.StyleSheetAdded, this._styleSheetAdded, this),
           cssModel.addEventListener(SDK.CSSModel.Events.StyleSheetRemoved, this._styleSheetRemoved, this));
     }
-    this._eventListeners.push(target.targetManager().addEventListener(
-        SDK.TargetManager.Events.SuspendStateChanged, this._suspendStateChanged, this));
   }
 
   /**
@@ -347,26 +343,29 @@ Bindings.NetworkProject = class {
   /**
    * @param {!SDK.Resource} resource
    */
-  _addResource(resource) {
+  _acceptsResource(resource) {
     var resourceType = resource.resourceType();
     // Only load selected resource types from resources.
     if (resourceType !== Common.resourceTypes.Image && resourceType !== Common.resourceTypes.Font &&
         resourceType !== Common.resourceTypes.Document && resourceType !== Common.resourceTypes.Manifest)
-      return;
+      return false;
 
     // Ignore non-images and non-fonts.
     if (resourceType === Common.resourceTypes.Image && resource.mimeType && !resource.mimeType.startsWith('image'))
-      return;
+      return false;
     if (resourceType === Common.resourceTypes.Font && resource.mimeType && !resource.mimeType.includes('font'))
-      return;
+      return false;
     if ((resourceType === Common.resourceTypes.Image || resourceType === Common.resourceTypes.Font) &&
         resource.contentURL().startsWith('data:'))
-      return;
+      return false;
+    return true;
+  }
 
-    // Never load document twice.

[dgozman, 2017/04/20 17:23:17]

What was this about? Why it doesn't happen anymore?

[lushnikov, 2017/04/21 00:51:27]

This was introduced in https://codereview.chromium.org/1409223006
That was before the project-per-frame approach and made sense, not anymore since
we have per-frame distribution (and will have frame attribution later)

-    var projectId = Bindings.NetworkProject.projectId(this._target, resource.frameId, false);
-    var project = this._workspaceProjects.get(projectId);
-    if (project && project.uiSourceCodeForURL(resource.url))
+  /**
+   * @param {!SDK.Resource} resource
+   */
+  _addResource(resource) {
+    if (!this._acceptsResource(resource))
       return;
 
     var uiSourceCode = this._createFile(resource, resource.frameId, false);
@@ -378,12 +377,14 @@ Bindings.NetworkProject = class {
    * @param {!SDK.ResourceTreeFrame} frame
    */
   _removeFrameResources(frame) {
-    var project = this._workspaceProject(frame.id, false);
-    for (var resource of frame.resources())
-      project.removeUISourceCode(resource.url);

[lushnikov, 2017/04/20 02:52:50]

this was a bug: it's incorrect to call project.removeUISourceCode for
ContentProviderBasedProjects. Proper way is calling removeFile.

-    project = this._workspaceProject(frame.id, true);
-    for (var resource of frame.resources())
-      project.removeUISourceCode(resource.url);
+    var regularProject = this._workspaceProject(frame.id, false);
+    var contentScriptsProject = this._workspaceProject(frame.id, true);
+    for (var resource of frame.resources()) {
+      if (!this._acceptsResource(resource))
+        continue;
+      regularProject.removeFile(resource.url);
+      contentScriptsProject.removeFile(resource.url);
+    }
   }
 
   /**
@@ -403,20 +404,6 @@ Bindings.NetworkProject = class {
   }
 
   /**
-   * @param {!Common.Event} event
-   */
-  _mainFrameNavigated(event) {
-    this._reset();
-  }
-
-  _suspendStateChanged() {

[dgozman, 2017/04/20 17:23:17]

Let's add a test for this.

[lushnikov, 2017/04/21 00:51:27]

Done in a separate patch.

-    if (this._target.targetManager().allTargetsSuspended())
-      this._reset();
-    else
-      this._populate();
-  }
-
-  /**
    * @param {!Common.ContentProvider} contentProvider
    * @param {string} frameId
    * @param {boolean} isContentScript