DevTools: remove UISourceCode.networkURL

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.Workspace} workspace
+ * @param {!WebInspector.FileSystemWorkspaceBinding} fileSystemWorkspaceBinding
  * @param {!WebInspector.FileSystemMapping} fileSystemMapping
  */
-WebInspector.NetworkMapping = function(workspace, fileSystemMapping)
+WebInspector.NetworkMapping = function(workspace, fileSystemWorkspaceBinding, fileSystemMapping)
 {
     this._workspace = workspace;
     this._fileSystemMapping = fileSystemMapping;
+    this._fileSystemWorkspaceBinding = fileSystemWorkspaceBinding;
     InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.RevealSourceLine, this._revealSourceLine, this);
 }
 
 WebInspector.NetworkMapping.prototype = {
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @return {string}
      */
     networkURL: function(uiSourceCode)
     {
-        // FIXME: This should use fileSystemMapping to determine url.
-        return uiSourceCode.networkURL();
+        if (uiSourceCode.project().type() === WebInspector.projectTypes.FileSystem) {
+            var fileSystemPath = this._fileSystemWorkspaceBinding.fileSystemPath(uiSourceCode.project().id());
+            return this.urlForPath(fileSystemPath, uiSourceCode.path());
+        }
+        return uiSourceCode.originURL();
     },
 
     /**
      * @param {string} url
      * @return {boolean}
      */
     hasMappingForURL: function(url)
     {
         return this._fileSystemMapping.hasMappingForURL(url);
     },
@@ skipping 67 matching lines @@
 
     /**
      * @param {!WebInspector.UISourceCode} networkUISourceCode
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {!WebInspector.FileSystemWorkspaceBinding} fileSystemWorkspaceBinding
      */
     addMapping: function(networkUISourceCode, uiSourceCode, fileSystemWorkspaceBinding)
     {
         var url = this.networkURL(networkUISourceCode);
         var path = uiSourceCode.path();
         var fileSystemPath = fileSystemWorkspaceBinding.fileSystemPath(uiSourceCode.project().id());

[dgozman, 2015/09/25 00:29:19]

Use this._fswb version.

         this._fileSystemMapping.addMappingForResource(url, fileSystemPath, path);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     removeMapping: function(uiSourceCode)
     {
         var networkURL = this.networkURL(uiSourceCode);
         this._fileSystemMapping.removeMappingForURL(networkURL);
@@ skipping 28 matching lines @@
         }
 
         this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, listener, this);
     },
 }
 
 /**
  * @type {!WebInspector.NetworkMapping}
  */
 WebInspector.networkMapping;