DevTools: simplify NetworkProject.addFileForURL method

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 205 matching lines @@
             return project;
 
         project = new WebInspector.ContentProviderBasedProject(this._workspace, projectId, projectType, "");
         project[WebInspector.NetworkProject._targetSymbol] = this.target();
         project[WebInspector.NetworkProject._frameSymbol] = frame;
         this._workspaceProjects.set(projectId, project);
         return project;
     },
 
     /**
-     * @param {string} url
+     * @param {!WebInspector.ContentProvider} contentProvider
      * @param {?WebInspector.ResourceTreeFrame} frame
-     * @param {!WebInspector.ContentProvider} contentProvider
      * @param {boolean=} isContentScript
      * @return {?WebInspector.UISourceCode}
      */
-    addFileForURL: function(url, contentProvider, frame, isContentScript)
+    addFile: function(contentProvider, frame, isContentScript)
     {
-        return this._createFile(url, contentProvider, frame, isContentScript || false, true);
+        var uiSourceCode = this._createFile(contentProvider, frame, isContentScript || false);
+        if (uiSourceCode)
+            this._addUISourceCodeWithProvider(uiSourceCode, contentProvider);
+        return uiSourceCode;
     },
 
     /**
      * @param {?WebInspector.ResourceTreeFrame} frame
      * @param {string} url
      */
     _removeFileForURL: function(frame, url)
     {
         var project = this._workspaceProjects.get(WebInspector.NetworkProject.projectId(this.target(), frame, false));
         if (!project)
@@ skipping 38 matching lines @@
     {
         var script = /** @type {!WebInspector.Script} */ (event.data);
         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;
         }
-        var uiSourceCode = this._createFile(script.sourceURL, script, WebInspector.ResourceTreeFrame.fromScript(script), script.isContentScript(), false);
+        var uiSourceCode = this._createFile(script, WebInspector.ResourceTreeFrame.fromScript(script), script.isContentScript());
         if (uiSourceCode) {
             uiSourceCode[WebInspector.NetworkProject._scriptSymbol] = script;
             this._addUISourceCodeWithProvider(uiSourceCode, script);
         }
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _styleSheetAdded: function(event)
     {
         var header = /** @type {!WebInspector.CSSStyleSheetHeader} */ (event.data);
         if (header.isInline && !header.hasSourceURL && header.origin !== "inspector")
             return;
 
-        var uiSourceCode = this._createFile(header.resourceURL(), header, WebInspector.ResourceTreeFrame.fromStyleSheet(header), false, false);
+        var uiSourceCode = this._createFile(header, WebInspector.ResourceTreeFrame.fromStyleSheet(header), false);
         if (uiSourceCode) {
             uiSourceCode[WebInspector.NetworkProject._styleSheetSymbol] = header;
             this._addUISourceCodeWithProvider(uiSourceCode, header);
         }
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _styleSheetRemoved: function(event)
@@ skipping 33 matching lines @@
             return;
         if (resourceType === WebInspector.resourceTypes.Font && resource.mimeType && !resource.mimeType.includes("font"))
             return;
         if ((resourceType === WebInspector.resourceTypes.Image || resourceType === WebInspector.resourceTypes.Font) && resource.contentURL().startsWith("data:"))
             return;
 
         // Never load document twice.
         if (this._workspace.uiSourceCodeForURL(resource.url))
             return;
 
-        var uiSourceCode = this._createFile(resource.url, resource, WebInspector.ResourceTreeFrame.fromResource(resource), false, false);
+        var uiSourceCode = this._createFile(resource, WebInspector.ResourceTreeFrame.fromResource(resource), false);
         if (uiSourceCode) {
             uiSourceCode[WebInspector.NetworkProject._resourceSymbol] = resource;
             this._addUISourceCodeWithProvider(uiSourceCode, resource);
         }
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _frameWillNavigate: function(event)
@@ skipping 18 matching lines @@
 
     _suspendStateChanged: function()
     {
         if (this.target().targetManager().allTargetsSuspended())
             this._reset();
         else
             this._populate();
     },
 
     /**
-     * @param {string} url
      * @param {!WebInspector.ContentProvider} contentProvider
      * @param {?WebInspector.ResourceTreeFrame} frame
      * @param {boolean} isContentScript
-     * @param {boolean} addIntoProject
      * @return {?WebInspector.UISourceCode}
      */
-    _createFile: function(url, contentProvider, frame, isContentScript, addIntoProject)
+    _createFile: function(contentProvider, frame, isContentScript)
     {
+        var url = contentProvider.contentURL();
         if (this._networkMapping.hasMappingForNetworkURL(url))
             return null;
 
         var project = this._workspaceProject(frame, isContentScript);
         var uiSourceCode = project.createUISourceCode(url, contentProvider.contentType());
         uiSourceCode[WebInspector.NetworkProject._targetSymbol] = this.target();
-        if (addIntoProject)
-            project.addUISourceCodeWithProvider(uiSourceCode, contentProvider);
         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 debuggerModel = WebInspector.DebuggerModel.fromTarget(target);
@@ skipping 11 matching lines @@
 
     _reset: function()
     {
         for (var project of this._workspaceProjects.values())
             project.reset();
         this._workspaceProjects.clear();
     },
 
     __proto__: WebInspector.SDKObject.prototype
 }