DevTools: merge uisourcecode's url-alike members.

third_party/WebKit/Source/devtools/front_end/bindings/NetworkMapping.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
  * @param {!WebInspector.TargetManager} targetManager
  * @param {!WebInspector.Workspace} workspace
  * @param {!WebInspector.FileSystemWorkspaceBinding} fileSystemWorkspaceBinding
  * @param {!WebInspector.FileSystemMapping} fileSystemMapping
@@ skipping 59 matching lines @@
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @return {string}
      */
     networkURL: function(uiSourceCode)
     {
         if (uiSourceCode.project().type() === WebInspector.projectTypes.FileSystem) {
             var fileSystemPath = this._fileSystemWorkspaceBinding.fileSystemPath(uiSourceCode.project().id());
-            return this._urlForPath(fileSystemPath, uiSourceCode.path());
+            return this._networkURLForFileSystemURL(fileSystemPath, uiSourceCode.url());
         }
-        return uiSourceCode.originURL();
+        return uiSourceCode.url();
     },
 
     /**
      * @param {string} url
      * @return {boolean}
      */
-    hasMappingForURL: function(url)
+    hasMappingForNetworkURL: function(url)
     {
-        return this._fileSystemMapping.hasMappingForURL(url);
+        return this._fileSystemMapping.hasMappingForNetworkURL(url);
     },
 
     /**
      * @param {!WebInspector.Target} target
      * @param {?WebInspector.ResourceTreeFrame} frame
      * @param {string} url
      * @return {?WebInspector.UISourceCode}
      */
     _networkUISourceCodeForURL: function(target, frame, url)
     {
-        var project = this._workspace.project(WebInspector.NetworkProject.projectId(target, frame, false));
-        return project ? project.uiSourceCode(url) : null;
+        return this._workspace.uiSourceCode(WebInspector.NetworkProject.projectId(target, frame, false), url);
     },
 
     /**
      * @param {!WebInspector.Target} target
      * @param {?WebInspector.ResourceTreeFrame} frame
      * @param {string} url
      * @return {?WebInspector.UISourceCode}
      */
     _contentScriptUISourceCodeForURL: function(target, frame, url)
     {
-        var project = this._workspace.project(WebInspector.NetworkProject.projectId(target, frame, true));
-        return project ? project.uiSourceCode(url) : null;
+        return this._workspace.uiSourceCode(WebInspector.NetworkProject.projectId(target, frame, true), url);
     },
 
     /**
      * @param {string} url
      * @return {?WebInspector.UISourceCode}
      */
     _fileSystemUISourceCodeForURL: function(url)
     {
         var file = this._fileSystemMapping.fileForURL(url);
         if (file) {
             var projectId = WebInspector.FileSystemWorkspaceBinding.projectId(file.fileSystemPath);
-            var project = this._workspace.project(projectId);
-            return project ? project.uiSourceCode(file.fileURL) : null;
+            return this._workspace.uiSourceCode(projectId, file.fileURL);
         }
         return null;
     },
 
     /**
      * @param {!WebInspector.Target} target
      * @param {?WebInspector.ResourceTreeFrame} frame
      * @param {string} url
      * @return {?WebInspector.UISourceCode}
      */
@@ skipping 23 matching lines @@
         var frame = WebInspector.ResourceTreeFrame.fromStyleSheet(header);
         return this._uiSourceCodeForURL(header.target(), frame, url);
     },
 
     /**
      * @param {string} url
      * @return {?WebInspector.UISourceCode}
      */
     uiSourceCodeForURLForAnyTarget: function(url)
     {
-        return this._fileSystemUISourceCodeForURL(url) || WebInspector.workspace.uiSourceCodeForOriginURL(url);
+        return this._fileSystemUISourceCodeForURL(url) || WebInspector.workspace.uiSourceCodeForURL(url);
     },
 
     /**
      * @param {string} fileSystemPath
      * @param {string} filePath
      * @return {string}
      */
-    _urlForPath: function(fileSystemPath, filePath)
+    _networkURLForFileSystemURL: function(fileSystemPath, filePath)
     {
-        return this._fileSystemMapping.urlForPath(fileSystemPath, filePath);
+        return this._fileSystemMapping.networkURLForFileSystemURL(fileSystemPath, filePath);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} networkUISourceCode
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     addMapping: function(networkUISourceCode, uiSourceCode)
     {
         var url = this.networkURL(networkUISourceCode);
-        var path = uiSourceCode.path();
+        var path = uiSourceCode.url();
         var fileSystemPath = this._fileSystemWorkspaceBinding.fileSystemPath(uiSourceCode.project().id());
         this._fileSystemMapping.addMappingForResource(url, fileSystemPath, path);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     removeMapping: function(uiSourceCode)
     {
         var networkURL = this.networkURL(uiSourceCode);
@@ skipping 49 matching lines @@
         this._fileSystemWorkspaceBinding.fileSystemManager().removeEventListener(WebInspector.IsolatedFileSystemManager.Events.FileSystemRemoved, this._fileSystemRemoved, this);
         this._fileSystemMapping.removeEventListener(WebInspector.FileSystemMapping.Events.FileMappingAdded, this._fileSystemMappingChanged, this);
         this._fileSystemMapping.removeEventListener(WebInspector.FileSystemMapping.Events.FileMappingRemoved, this._fileSystemMappingChanged, this);
     }
 }
 
 /**
  * @type {!WebInspector.NetworkMapping}
  */
 WebInspector.networkMapping;