DevTools: replace content provider when re-adding into network project

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 136 matching lines @@
  * @param {!WebInspector.Target} target
  * @param {!WebInspector.Workspace} workspace
  * @param {!WebInspector.NetworkMapping} networkMapping
  */
 WebInspector.NetworkProject = function(target, workspace, networkMapping)
 {
     WebInspector.SDKObject.call(this, target);
     this._workspace = workspace;
     this._networkMapping = networkMapping;
     this._projectDelegates = {};
-    this._processedURLs = {};
     target[WebInspector.NetworkProject._networkProjectSymbol] = this;
 
     target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this);
     target.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);
     }
@@ skipping 92 matching lines @@
         var projectDelegate = this._projectDelegate(projectURL, isContentScript || false);
         var path = projectDelegate.addFile(parentPath, name, url, contentProvider);
         var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (this._workspace.uiSourceCode(projectDelegate.id(), path));
         console.assert(uiSourceCode);
         return uiSourceCode;
     },
 
     /**
      * @param {string} url
      */
-    removeFileForURL: function(url)
+    _removeFileForURL: function(url)
     {
-        delete this._processedURLs[url];
         var splitURL = WebInspector.ParsedURL.splitURLIntoPathComponents(url);
         var projectURL = splitURL[0];
         var path = splitURL.slice(1).join("/");
         var projectDelegate = this._projectDelegates[WebInspector.NetworkProject.projectId(this.target(), projectURL, false)];
+        if (!projectDelegate)

[dgozman, 2015/11/10 21:01:25]

How come you now need this check?

+            return;
         projectDelegate.removeFile(path);
     },
 
     _populate: function()
     {
         /**
          * @param {!WebInspector.ResourceTreeFrame} frame
          * @this {WebInspector.NetworkProject}
          */
         function populateFrame(frame)
@@ skipping 10 matching lines @@
         if (mainFrame)
             populateFrame.call(this, mainFrame);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _parsedScriptSource: function(event)
     {
         var script = /** @type {!WebInspector.Script} */ (event.data);
-        if (!script.sourceURL || (script.isInlineScript() && !script.hasSourceURL))
+        if (!script.sourceURL || script.isLiveEdit() || (script.isInlineScript() && !script.hasSourceURL))
             return;
         // Filter out embedder injected content scripts.
         if (script.isContentScript() && !script.hasSourceURL) {
             var parsedURL = new WebInspector.ParsedURL(script.sourceURL);
             if (!parsedURL.isValid)
                 return;
         }
         this._addFile(script.sourceURL, script, script.isContentScript());
     },
 
@@ skipping 11 matching lines @@
 
     /**
      * @param {!WebInspector.Event} event
      */
     _styleSheetRemoved: function(event)
     {
         var header = /** @type {!WebInspector.CSSStyleSheetHeader} */ (event.data);
         if (header.isInline && !header.hasSourceURL && header.origin !== "inspector")
             return;
 
-        this.removeFileForURL(header.resourceURL());
+        this._removeFileForURL(header.resourceURL());
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _resourceAdded: function(event)
     {
         var resource = /** @type {!WebInspector.Resource} */ (event.data);
         this._addResource(resource);
     },
 
     /**
      * @param {!WebInspector.Resource} resource
      */
     _addResource: function(resource)
     {
-        if (resource.resourceType() === WebInspector.resourceTypes.Document)
-            this._addFile(resource.url, resource);
+        // Only load documents from resources.
+        if (resource.resourceType() !== WebInspector.resourceTypes.Document)
+            return;
+
+        // Never load document twice.
+        if (this._workspace.uiSourceCodeForOriginURL(resource.url))
+            return;
+        this._addFile(resource.url, resource);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _mainFrameNavigated: function(event)
     {
         this._reset();
         this._populate();
     },
@@ skipping 12 matching lines @@
      * @param {boolean=} isContentScript
      */
     _addFile: function(url, contentProvider, isContentScript)
     {
         if (this._networkMapping.hasMappingForURL(url))
             return;
 
         var type = contentProvider.contentType();
         if (type !== WebInspector.resourceTypes.Stylesheet && type !== WebInspector.resourceTypes.Document && type !== WebInspector.resourceTypes.Script)
             return;
-        if (this._processedURLs[url])
-            return;
-        this._processedURLs[url] = true;
         var uiSourceCode = this.addFileForURL(url, contentProvider, isContentScript);
         uiSourceCode[WebInspector.NetworkProject._contentTypeSymbol] = type;
     },
 
     _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 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.CSSStyleModel.fromTarget(target);
         if (cssModel) {
             cssModel.removeEventListener(WebInspector.CSSStyleModel.Events.StyleSheetAdded, this._styleSheetAdded, this);
             cssModel.removeEventListener(WebInspector.CSSStyleModel.Events.StyleSheetRemoved, this._styleSheetRemoved, this);
         }
         delete target[WebInspector.NetworkProject._networkProjectSymbol];
     },
 
     _reset: function()
     {
-        this._processedURLs = {};
         for (var projectId in this._projectDelegates)
             this._projectDelegates[projectId].reset();
         this._projectDelegates = {};
     },
 
     __proto__: WebInspector.SDKObject.prototype
 }