DevTools: merge UISourceCode's parentPath, name, originURL and uri.

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 84 matching lines @@
 }
 
 WebInspector.NetworkProject._networkProjectSymbol = Symbol("networkProject");
 WebInspector.NetworkProject._resourceSymbol = Symbol("resource");
 WebInspector.NetworkProject._scriptSymbol = Symbol("script");
 WebInspector.NetworkProject._styleSheetSymbol = Symbol("styleSheet");
 WebInspector.NetworkProject._targetSymbol = Symbol("target");
 
 /**
  * @param {!WebInspector.Target} target
- * @param {string} projectURL
  * @param {boolean} isContentScripts
  * @return {string}
  */
-WebInspector.NetworkProject.projectId = function(target, projectURL, isContentScripts)
+WebInspector.NetworkProject.projectId = function(target, isContentScripts)
 {
-    return target.id() + ":" + (isContentScripts ? "contentscripts:" : "") + projectURL;
+    return target.id() + ":" + (isContentScripts ? "contentscripts:" : "");
 }
 
 /**
  * @param {!WebInspector.Target} target
  * @return {!WebInspector.NetworkProject}
  */
 WebInspector.NetworkProject.forTarget = function(target)
 {
     return target[WebInspector.NetworkProject._networkProjectSymbol];
 }
@@ skipping 53 matching lines @@
         var resource = uiSourceCode[WebInspector.NetworkProject._resourceSymbol];
         if (resource)
             frameId = resource.frameId;
     }
 
     return frameId ? target.resourceTreeModel.frameForId(frameId) : null;
 }
 
 WebInspector.NetworkProject.prototype = {
     /**
-     * @param {string} projectURL
      * @param {boolean} isContentScripts
      * @return {!WebInspector.ContentProviderBasedProject}
      */
-    _workspaceProject: function(projectURL, isContentScripts)
+    _workspaceProject: function(isContentScripts)
     {
-        var projectId = WebInspector.NetworkProject.projectId(this.target(), projectURL, isContentScripts);
+        var projectId = WebInspector.NetworkProject.projectId(this.target(), isContentScripts);
         var projectType = isContentScripts ? WebInspector.projectTypes.ContentScripts : WebInspector.projectTypes.Network;
 
         var project = this._workspaceProjects.get(projectId);
         if (project)
             return project;
 
-        project = new WebInspector.ContentProviderBasedProject(this._workspace, projectId, projectType, projectURL, this._computeDisplayName(projectURL));
+        project = new WebInspector.ContentProviderBasedProject(this._workspace, projectId, projectType, "");
         this._workspaceProjects.set(projectId, project);
         return project;
     },
 
     /**
      * @param {string} url
-     * @return {string}
-     */
-    _computeDisplayName: function(url)
-    {
-        for (var context of this.target().runtimeModel.executionContexts()) {
-            if (context.name && context.origin && url.startsWith(context.origin))
-                return context.name;
-        }
-
-        var targetSuffix = this.target().isPage() ? "" : " \u2014 " + this.target().name();
-        if (!url)
-            return WebInspector.UIString("(no domain)") + targetSuffix;
-        var parsedURL = new WebInspector.ParsedURL(url);
-        var prettyURL = parsedURL.isValid ? parsedURL.host + (parsedURL.port ? (":" + parsedURL.port) : "") : "";
-        return (prettyURL || url) + targetSuffix;
-    },
-
-    /**
-     * @param {string} url
      * @param {!WebInspector.ContentProvider} contentProvider
      * @param {boolean=} isContentScript
      * @return {?WebInspector.UISourceCode}
      */
     addFileForURL: function(url, contentProvider, isContentScript)
     {
         return this._createFile(url, contentProvider, isContentScript || false, true);
     },
 
     /**
      * @param {string} url
      */
     _removeFileForURL: function(url)
     {
-        var splitURL = WebInspector.ParsedURL.splitURLIntoPathComponents(url);
-        var projectURL = splitURL[0];
-        var path = splitURL.slice(1).join("/");
-        var project = this._workspaceProjects.get(WebInspector.NetworkProject.projectId(this.target(), projectURL, false));
+        var project = this._workspaceProjects.get(WebInspector.NetworkProject.projectId(this.target(), false));
         if (!project)
             return;
-        project.removeFile(path);
+        project.removeFile(url);
     },
 
     _populate: function()
     {
         /**
          * @param {!WebInspector.ResourceTreeFrame} frame
          * @this {WebInspector.NetworkProject}
          */
         function populateFrame(frame)
         {
@@ skipping 96 matching lines @@
         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.uiSourceCodeForOriginURL(resource.url))
             return;
 
         var uiSourceCode = this._createFile(resource.url, resource, false, false);
-        uiSourceCode[WebInspector.NetworkProject._resourceSymbol] = resource;
-        this._addUISourceCodeWithProvider(uiSourceCode, resource);
+        if (uiSourceCode) {
+            uiSourceCode[WebInspector.NetworkProject._resourceSymbol] = resource;
+            this._addUISourceCodeWithProvider(uiSourceCode, resource);
+        }
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _mainFrameNavigated: function(event)
     {
         this._reset();
         this._populate();
     },
@@ skipping 11 matching lines @@
      * @param {!WebInspector.ContentProvider} contentProvider
      * @param {boolean} isContentScript
      * @param {boolean} addIntoProject
      * @return {?WebInspector.UISourceCode}
      */
     _createFile: function(url, contentProvider, isContentScript, addIntoProject)
     {
         if (this._networkMapping.hasMappingForURL(url))
             return null;
 
-        var splitURL = WebInspector.ParsedURL.splitURLIntoPathComponents(url);
-        var projectURL = splitURL[0];
-        var parentPath = splitURL.slice(1, -1).join("/");
-        var name = splitURL.peekLast() || "";
-        var project = this._workspaceProject(projectURL, isContentScript);
-        var uiSourceCode = project.createUISourceCode(parentPath, name, url, contentProvider.contentType());
+        var project = this._workspaceProject(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();
@@ skipping 14 matching lines @@
 
     _reset: function()
     {
         for (var project of this._workspaceProjects.values())
             project.reset();
         this._workspaceProjects.clear();
     },
 
     __proto__: WebInspector.SDKObject.prototype
 }