DevTools: merge uisourcecode's url-alike members.

third_party/WebKit/Source/devtools/front_end/sources/ScriptFormatterEditorAction.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @constructor
  * @implements {WebInspector.DebuggerSourceMapping}
  * @param {!WebInspector.DebuggerModel} debuggerModel
  * @param {!WebInspector.ScriptFormatterEditorAction} editorAction
  */
@@ skipping 139 matching lines @@
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _editorSelected: function(event)
     {
         var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.data);
         this._updateButton(uiSourceCode);
 
-        var path = uiSourceCode.project().id() + ":" + uiSourceCode.path();
+        var path = uiSourceCode.project().id() + ":" + uiSourceCode.url();
         var networkURL = WebInspector.networkMapping.networkURL(uiSourceCode);
         if (this._isFormatableScript(uiSourceCode) && networkURL && this._pathsToFormatOnLoad.has(path) && !this._formattedPaths.get(path))
             this._formatUISourceCodeScript(uiSourceCode);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _editorClosed: function(event)
     {
@@ skipping 86 matching lines @@
             return;
 
         this._formatData.remove(formattedUISourceCode);
         var path = formatData.projectId + ":" + formatData.path;
         this._formattedPaths.remove(path);
         this._pathsToFormatOnLoad.delete(path);
         for (var i = 0; i < formatData.scripts.length; ++i) {
             this._uiSourceCodes.remove(formatData.scripts[i]);
             WebInspector.debuggerWorkspaceBinding.popSourceMapping(formatData.scripts[i]);
         }
-        this._project.removeFile(formattedUISourceCode.path());
+        this._project.removeFile(formattedUISourceCode.url());
     },
 
     /**
      * @param {!WebInspector.Target} target
      */
     _cleanForTarget: function(target)
     {
         var uiSourceCodes = this._formatData.keysArray();
         for (var i = 0; i < uiSourceCodes.length; ++i) {
             WebInspector.debuggerWorkspaceBinding.setSourceMapping(target, uiSourceCodes[i], null);
             var formatData = this._formatData.get(uiSourceCodes[i]);
             var scripts = [];
             for (var j = 0; j < formatData.scripts.length; ++j) {
                 if (formatData.scripts[j].target() === target)
                     this._uiSourceCodes.remove(formatData.scripts[j]);
                 else
                     scripts.push(formatData.scripts[j]);
             }
 
             if (scripts.length)
                 formatData.scripts = scripts;
             else {
                 this._formattedPaths.remove(formatData.projectId + ":" + formatData.path);
                 this._formatData.remove(uiSourceCodes[i]);
-                this._project.removeFile(uiSourceCodes[i].path());
+                this._project.removeFile(uiSourceCodes[i].url());
             }
         }
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _debuggerReset: function(event)
     {
         var debuggerModel = /** @type {!WebInspector.DebuggerModel} */ (event.target);
@@ skipping 29 matching lines @@
             return rawLocations.map(function(rawLocation) { return rawLocation.script(); });
         }
         return [];
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     _formatUISourceCodeScript: function(uiSourceCode)
     {
-        var formattedPath = this._formattedPaths.get(uiSourceCode.project().id() + ":" + uiSourceCode.path());
+        var formattedPath = this._formattedPaths.get(uiSourceCode.project().id() + ":" + uiSourceCode.url());
         if (formattedPath) {
             var uiSourceCodePath = formattedPath;
             var formattedUISourceCode = this._workspace.uiSourceCode(this._projectId, uiSourceCodePath);
             var formatData = formattedUISourceCode ? this._formatData.get(formattedUISourceCode) : null;
             if (formatData)
                  this._showIfNeeded(uiSourceCode, /** @type {!WebInspector.UISourceCode} */ (formattedUISourceCode), formatData.mapping);
             return;
         }
 
         uiSourceCode.requestContent(contentLoaded.bind(this));
@@ skipping 10 matching lines @@
 
         /**
          * @this {WebInspector.ScriptFormatterEditorAction}
          * @param {string} formattedContent
          * @param {!WebInspector.FormatterSourceMapping} formatterMapping
          */
         function innerCallback(formattedContent, formatterMapping)
         {
             var scripts = this._scriptsForUISourceCode(uiSourceCode);
             var contentProvider = new WebInspector.StaticContentProvider(uiSourceCode.contentType(), formattedContent);
-            var formattedUISourceCode = this._project.addContentProvider(uiSourceCode.path() + ":formatted", contentProvider);
-            var formattedPath = formattedUISourceCode.path();
-            var formatData = new WebInspector.FormatterScriptMapping.FormatData(uiSourceCode.project().id(), uiSourceCode.path(), formatterMapping, scripts);
+            var formattedUISourceCode = this._project.addContentProvider(uiSourceCode.url() + ":formatted", contentProvider);
+            var formattedPath = formattedUISourceCode.url();
+            var formatData = new WebInspector.FormatterScriptMapping.FormatData(uiSourceCode.project().id(), uiSourceCode.url(), formatterMapping, scripts);
             this._formatData.set(formattedUISourceCode, formatData);
-            var path = uiSourceCode.project().id() + ":" + uiSourceCode.path();
+            var path = uiSourceCode.project().id() + ":" + uiSourceCode.url();
             this._formattedPaths.set(path, formattedPath);
             this._pathsToFormatOnLoad.add(path);
             for (var i = 0; i < scripts.length; ++i) {
                 this._uiSourceCodes.set(scripts[i], formattedUISourceCode);
                 var scriptMapping = /** @type {!WebInspector.FormatterScriptMapping} */(this._scriptMappingByTarget.get(scripts[i].target()));
                 WebInspector.debuggerWorkspaceBinding.pushSourceMapping(scripts[i], scriptMapping);
             }
 
             var targets = WebInspector.targetManager.targets();
             for (var i = 0; i < targets.length; ++i) {
                 var scriptMapping = /** @type {!WebInspector.FormatterScriptMapping} */(this._scriptMappingByTarget.get(targets[i]));
                 WebInspector.debuggerWorkspaceBinding.setSourceMapping(targets[i], formattedUISourceCode, scriptMapping);
             }
             this._showIfNeeded(uiSourceCode, formattedUISourceCode, formatterMapping);
         }
     }
 }