DevTools: merge uisourcecode's url-alike members.

third_party/WebKit/Source/devtools/front_end/workspace/Workspace.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 157 matching lines @@
      * @param {function(!Array.<string>)} callback
      */
     findFilesMatchingSearchRequest: function(searchConfig, filesMathingFileQuery, progress, callback) { },
 
     /**
      * @param {!WebInspector.Progress} progress
      */
     indexContent: function(progress) { },
 
     /**
-     * @param {string} path
+     * @param {string} url
      * @return {?WebInspector.UISourceCode}
      */
-    uiSourceCode: function(path) { },
-
-    /**
-     * @param {string} originURL
-     * @return {?WebInspector.UISourceCode}
-     */
-    uiSourceCodeForOriginURL: function(originURL) { },
+    uiSourceCodeForURL: function(url) { },
 
     /**
      * @return {!Array.<!WebInspector.UISourceCode>}
      */
     uiSourceCodes: function() { }
 }
 
 /**
  * @enum {string}
  */
@@ skipping 72 matching lines @@
         return new WebInspector.UISourceCode(this._project, url, contentType);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {boolean=} replace
      * @return {boolean}
      */
     addUISourceCode: function(uiSourceCode, replace)
     {
-        var path = uiSourceCode.path();
-        if (this.uiSourceCode(path)) {
+        var url = uiSourceCode.url();
+        if (this.uiSourceCodeForURL(url)) {
             if (replace)
-                this.removeUISourceCode(path);
+                this.removeUISourceCode(url);
             else
                 return false;
         }
-        this._uiSourceCodesMap.set(path, {uiSourceCode: uiSourceCode, index: this._uiSourceCodesList.length});
+        this._uiSourceCodesMap.set(url, {uiSourceCode: uiSourceCode, index: this._uiSourceCodesList.length});
         this._uiSourceCodesList.push(uiSourceCode);
         this._workspace.dispatchEventToListeners(WebInspector.Workspace.Events.UISourceCodeAdded, uiSourceCode);
         return true;
     },
 
     /**
-     * @param {string} path
+     * @param {string} url
      */
-    removeUISourceCode: function(path)
+    removeUISourceCode: function(url)
     {
-        var uiSourceCode = this.uiSourceCode(path);
+        var uiSourceCode = this.uiSourceCodeForURL(url);
         if (!uiSourceCode)
             return;
 
-        var entry = this._uiSourceCodesMap.get(path);
+        var entry = this._uiSourceCodesMap.get(url);
         var movedUISourceCode = this._uiSourceCodesList[this._uiSourceCodesList.length - 1];
         this._uiSourceCodesList[entry.index] = movedUISourceCode;
-        var movedEntry = this._uiSourceCodesMap.get(movedUISourceCode.path());
+        var movedEntry = this._uiSourceCodesMap.get(movedUISourceCode.url());
         movedEntry.index = entry.index;
         this._uiSourceCodesList.splice(this._uiSourceCodesList.length - 1, 1);
-        this._uiSourceCodesMap.delete(path);
+        this._uiSourceCodesMap.delete(url);
         this._workspace.dispatchEventToListeners(WebInspector.Workspace.Events.UISourceCodeRemoved, entry.uiSourceCode);
     },
 
     removeProject: function()
     {
         this._workspace._removeProject(this._project);
         this._uiSourceCodesMap = new Map();
         this._uiSourceCodesList = [];
     },
 
     /**
-     * @param {string} path
+     * @param {string} url
      * @return {?WebInspector.UISourceCode}
      */
-    uiSourceCode: function(path)
+    uiSourceCodeForURL: function(url)
     {
-        var entry = this._uiSourceCodesMap.get(path);
+        var entry = this._uiSourceCodesMap.get(url);
         return entry ? entry.uiSourceCode : null;
     },
 
     /**
-     * @param {string} originURL
-     * @return {?WebInspector.UISourceCode}
-     */
-    uiSourceCodeForOriginURL: function(originURL)
-    {
-        for (var i = 0; i < this._uiSourceCodesList.length; ++i) {
-            var uiSourceCode = this._uiSourceCodesList[i];
-            if (uiSourceCode.originURL() === originURL)
-                return uiSourceCode;
-        }
-        return null;
-    },
-
-    /**
      * @return {!Array.<!WebInspector.UISourceCode>}
      */
     uiSourceCodes: function()
     {
         return this._uiSourceCodesList;
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {string} newName
      */
     renameUISourceCode: function(uiSourceCode, newName)
     {
-        var oldPath = uiSourceCode.path();
-        var newPath = uiSourceCode.parentPath() ? uiSourceCode.parentPath() + "/" + newName : newName;
+        var oldPath = uiSourceCode.url();
+        var newPath = uiSourceCode.parentURL() ? uiSourceCode.parentURL() + "/" + newName : newName;
         var value = /** @type {!{uiSourceCode: !WebInspector.UISourceCode, index: number}} */ (this._uiSourceCodesMap.get(oldPath));
         this._uiSourceCodesMap.set(newPath, value);
         this._uiSourceCodesMap.delete(oldPath);
     }
 }
 
 /**
  * @constructor
  * @extends {WebInspector.Object}
  */
@@ skipping 32 matching lines @@
         var unsavedSourceCodes = [];
         var projects = this.projectsForType(WebInspector.projectTypes.FileSystem);
         for (var i = 0; i < projects.length; ++i)
             unsavedSourceCodes = unsavedSourceCodes.concat(projects[i].uiSourceCodes().filter(filterUnsaved));
 
         return unsavedSourceCodes;
     },
 
     /**
      * @param {string} projectId
-     * @param {string} path
+     * @param {string} url
      * @return {?WebInspector.UISourceCode}
      */
-    uiSourceCode: function(projectId, path)
+    uiSourceCode: function(projectId, url)
     {
         var project = this._projects.get(projectId);
-        return project ? project.uiSourceCode(path) : null;
+        return project ? project.uiSourceCodeForURL(url) : null;
     },
 
     /**
-     * @param {string} originURL
+     * @param {string} url
      * @return {?WebInspector.UISourceCode}
      */
-    uiSourceCodeForOriginURL: function(originURL)
+    uiSourceCodeForURL: function(url)
     {
-        var projects = this.projectsForType(WebInspector.projectTypes.Network);
-        projects = projects.concat(this.projectsForType(WebInspector.projectTypes.ContentScripts));
-        for (var project of projects) {
-            var uiSourceCode = project.uiSourceCodeForOriginURL(originURL);
+        for (var project of this._projects.values()) {
+            var uiSourceCode = project.uiSourceCodeForURL(url);
             if (uiSourceCode)
                 return uiSourceCode;
         }
-        return null;
-    },
-
-    /**
-     * @param {string} originURL
-     * @return {?WebInspector.UISourceCode}
-     */
-    filesystemUISourceCode: function(originURL)
-    {
-        for (var project of this.projectsForType(WebInspector.projectTypes.FileSystem)) {
-            var uiSourceCode = project.uiSourceCodeForOriginURL(originURL);
-            if (uiSourceCode)
-                return uiSourceCode;
-        }
         return null;
     },
 
     /**
      * @param {string} type
      * @return {!Array.<!WebInspector.UISourceCode>}
      */
     uiSourceCodesForProjectType: function(type)
     {
         var result = [];
@@ skipping 79 matching lines @@
         return this._hasResourceContentTrackingExtensions;
     },
 
     __proto__: WebInspector.Object.prototype
 }
 
 /**
  * @type {!WebInspector.Workspace}
  */
 WebInspector.workspace;