DevTools: merge uisourcecode's url-alike members.

third_party/WebKit/Source/devtools/front_end/bindings/FileSystemWorkspaceBinding.js

 /*
  * Copyright (C) 2013 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 48 matching lines @@
     return fileSystemPath;
 }
 
 /**
  * @param {!WebInspector.UISourceCode} uiSourceCode
  * @return {!Array<string>}
  */
 WebInspector.FileSystemWorkspaceBinding.relativePath = function(uiSourceCode)
 {
     var baseURL = /** @type {!WebInspector.FileSystemWorkspaceBinding.FileSystem}*/(uiSourceCode.project())._fileSystemBaseURL;
-    return uiSourceCode.path().substring(baseURL.length).split("/");
+    return uiSourceCode.url().substring(baseURL.length).split("/");
 }
 
 /**
  * @param {!WebInspector.Project} project
  * @param {string} relativePath
  * @return {string}
  */
 WebInspector.FileSystemWorkspaceBinding.completeURL = function(project, relativePath)
 {
     var fsProject = /** @type {!WebInspector.FileSystemWorkspaceBinding.FileSystem}*/(project);
@@ skipping 116 matching lines @@
     {
         return this._fileSystemPath;
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @return {string}
      */
     _filePathForUISourceCode: function(uiSourceCode)
     {
-        return uiSourceCode.path().substring(this._fileSystemPath.length);
+        return uiSourceCode.url().substring(this._fileSystemPath.length);
     },
 
     /**
      * @override
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {function(?string)} callback
      */
     requestFileContent: function(uiSourceCode, callback)
     {
         var filePath = this._filePathForUISourceCode(uiSourceCode);
@@ skipping 47 matching lines @@
 
     /**
      * @override
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {string} newName
      * @param {function(boolean, string=, string=, !WebInspector.ResourceType=)} callback
      */
     rename: function(uiSourceCode, newName, callback)
     {
         if (newName === uiSourceCode.name()) {
-            callback(true, uiSourceCode.name(), uiSourceCode.originURL(), uiSourceCode.contentType());
+            callback(true, uiSourceCode.name(), uiSourceCode.url(), uiSourceCode.contentType());
             return;
         }
 
         var filePath = this._filePathForUISourceCode(uiSourceCode);
         this._fileSystem.renameFile(filePath, newName, innerCallback.bind(this));
 
         /**
          * @param {boolean} success
          * @param {string=} newName
          * @this {WebInspector.FileSystemWorkspaceBinding.FileSystem}
          */
         function innerCallback(success, newName)
         {
             if (!success || !newName) {
                 callback(false, newName);
                 return;
             }
             console.assert(newName);
             var slash = filePath.lastIndexOf("/");
             var parentPath = filePath.substring(0, slash);
             filePath = parentPath + "/" + newName;
             filePath = filePath.substr(1);
             var extension = this._extensionForPath(newName);
-            var newOriginURL = this._fileSystemBaseURL + filePath;
+            var newURL = this._fileSystemBaseURL + filePath;
             var newContentType = WebInspector.FileSystemWorkspaceBinding._contentTypeForExtension(extension);
             this.renameUISourceCode(uiSourceCode, newName);
-            callback(true, newName, newOriginURL, newContentType);
+            callback(true, newName, newURL, newContentType);
         }
     },
 
     /**
      * @override
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {string} query
      * @param {boolean} caseSensitive
      * @param {boolean} isRegex
      * @param {function(!Array.<!WebInspector.ContentProvider.SearchMatch>)} callback
@@ skipping 89 matching lines @@
      * @param {string} path
      * @param {function()=} callback
      */
     refresh: function(path, callback)
     {
         this._fileSystem.requestFilesRecursive(path, this._addFile.bind(this), callback);
     },
 
     /**
      * @override
-     * @param {string} path
+     * @param {string} url
      */
-    excludeFolder: function(path)
+    excludeFolder: function(url)
     {
-        var relativeFolder = path.substring(this._fileSystemBaseURL.length);
+        var relativeFolder = url.substring(this._fileSystemBaseURL.length);
         if (!relativeFolder.startsWith("/"))
             relativeFolder = "/" + relativeFolder;
         if (!relativeFolder.endsWith("/"))
             relativeFolder += "/";
         this._fileSystem.addExcludedFolder(relativeFolder);
 
         var uiSourceCodes = this.uiSourceCodes().slice();
         for (var i = 0; i < uiSourceCodes.length; ++i) {
             var uiSourceCode = uiSourceCodes[i];
-            if (uiSourceCode.path().startsWith(path))
-                this.removeUISourceCode(uiSourceCode.path());
+            if (uiSourceCode.url().startsWith(url))
+                this.removeUISourceCode(uiSourceCode.url());
         }
     },
 
     /**
      * @override
      * @param {string} path
      * @param {?string} name
      * @param {string} content
      * @param {function(?WebInspector.UISourceCode)} callback
      */
@@ skipping 62 matching lines @@
         var uiSourceCode = this.createUISourceCode(this._fileSystemBaseURL + filePath, contentType);
         this.addUISourceCode(uiSourceCode);
         return uiSourceCode;
     },
 
     /**
      * @param {string} path
      */
     _fileChanged: function(path)
     {
-        var uiSourceCode = this.uiSourceCode(path);
+        var uiSourceCode = this.uiSourceCodeForURL(path);
         if (!uiSourceCode) {
             this._addFile(path);
             return;
         }
         uiSourceCode.checkContentUpdated();
     },
 
     dispose: function()
     {
         this.removeProject();
     },
 
     __proto__: WebInspector.ProjectStore.prototype
 }