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

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._urlForPath(fileSystemPath, uiSourceCode.path());
         }
         return uiSourceCode.originURL();
     },
 
     /**
      * @param {string} url
      * @return {boolean}
      */
     hasMappingForURL: function(url)
     {
         return this._fileSystemMapping.hasMappingForURL(url);
     },
 
     /**
      * @param {string} url
      * @param {!WebInspector.Target} target
      * @return {?WebInspector.UISourceCode}
      */
     _networkUISourceCodeForURL: function(url, target)
     {
-        var splitURL = WebInspector.ParsedURL.splitURLIntoPathComponents(url);
-        var projectId = WebInspector.NetworkProject.projectId(target, splitURL[0], false);
-        var project = this._workspace.project(projectId);
-        return project ? project.uiSourceCode(splitURL.slice(1).join("/")) : null;
+        var project = this._workspace.project(WebInspector.NetworkProject.projectId(target, false));
+        return project ? project.uiSourceCode(url) : null;
     },
 
     /**
      * @param {string} url
      * @param {!WebInspector.Target} target
      * @return {?WebInspector.UISourceCode}
      */
     _contentScriptUISourceCodeForURL: function(url, target)
     {
-        var splitURL = WebInspector.ParsedURL.splitURLIntoPathComponents(url);
-        var projectId = WebInspector.NetworkProject.projectId(target, splitURL[0], true);
-        var project = this._workspace.project(projectId);
-        return project ? project.uiSourceCode(splitURL.slice(1).join("/")) : null;
+        var project = this._workspace.project(WebInspector.NetworkProject.projectId(target, true));
+        return project ? project.uiSourceCode(url) : null;
     },
 
     /**
      * @param {string} url
      * @param {!WebInspector.Target} target
      * @return {?WebInspector.UISourceCode}
      */
     _uiSourceCodeForURL: function(url, target)
     {
         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.filePath) : null;
+            return project ? project.uiSourceCode("file://" + file.fileSystemPath + "/" + file.filePath) : null;

[dgozman, 2015/12/16 07:58:30]

Can we incapsulate this logic in FSWB static method?

[pfeldman, 2015/12/16 18:02:18]

It is currently a mess that requires separate brushing up. Moved it into mapping
for now.

         }
 
         return this._networkUISourceCodeForURL(url, target) || this._contentScriptUISourceCodeForURL(url, target);
     },
 
     /**
      * @param {string} url
      * @param {!WebInspector.Script} script
      * @return {?WebInspector.UISourceCode}
      */
@@ skipping 24 matching lines @@
                 return result;
         }
         return null;
     },
 
     /**
      * @param {string} fileSystemPath
      * @param {string} filePath
      * @return {string}
      */
-    urlForPath: function(fileSystemPath, filePath)
+    _urlForPath: function(fileSystemPath, filePath)
     {
         return this._fileSystemMapping.urlForPath(fileSystemPath, filePath);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} networkUISourceCode
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     addMapping: function(networkUISourceCode, uiSourceCode)
     {
@@ skipping 61 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;