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

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

Index: third_party/WebKit/Source/devtools/front_end/bindings/NetworkMapping.js
diff --git a/third_party/WebKit/Source/devtools/front_end/bindings/NetworkMapping.js b/third_party/WebKit/Source/devtools/front_end/bindings/NetworkMapping.js
index 7b2cea79752431d0946222fb2d7be8e8c563345f..f1a1f8a414a437b43b91c36501ab1dc1ccf0b9a0 100644
--- a/third_party/WebKit/Source/devtools/front_end/bindings/NetworkMapping.js
+++ b/third_party/WebKit/Source/devtools/front_end/bindings/NetworkMapping.js
@@ -77,7 +77,7 @@ WebInspector.NetworkMapping.prototype = {
     {
         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();
     },
@@ -98,10 +98,8 @@ WebInspector.NetworkMapping.prototype = {
      */
     _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;
     },
 
     /**
@@ -111,10 +109,8 @@ WebInspector.NetworkMapping.prototype = {
      */
     _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;
     },
 
     /**
@@ -128,7 +124,7 @@ WebInspector.NetworkMapping.prototype = {
         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;
         }
 
         return this._networkUISourceCodeForURL(url, target) || this._contentScriptUISourceCodeForURL(url, target);
@@ -173,7 +169,7 @@ WebInspector.NetworkMapping.prototype = {
      * @param {string} filePath
      * @return {string}
      */
-    urlForPath: function(fileSystemPath, filePath)
+    _urlForPath: function(fileSystemPath, filePath)

[dgozman, 2015/12/15 22:22:47]

Does anybody use it?

[pfeldman, 2015/12/16 01:34:28]

Yep, line 80. And some tests.

     {
         return this._fileSystemMapping.urlForPath(fileSystemPath, filePath);
     },