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

third_party/WebKit/Source/devtools/front_end/workspace/FileSystemMapping.js

 /*
  * Copyright (C) 2012 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 35 matching lines @@
     FileMappingRemoved: "FileMappingRemoved"
 }
 
 WebInspector.FileSystemMapping.prototype = {
     _loadFromSettings: function()
     {
         var savedMapping = this._fileSystemMappingSetting.get();
         this._fileSystemMappings = {};
         for (var fileSystemPath in savedMapping) {
             var savedFileSystemMappings = savedMapping[fileSystemPath];
-
             this._fileSystemMappings[fileSystemPath] = [];
             var fileSystemMappings = this._fileSystemMappings[fileSystemPath];
 
             for (var i = 0; i < savedFileSystemMappings.length; ++i) {
                 var savedEntry = savedFileSystemMappings[i];
-                var entry = new WebInspector.FileSystemMapping.Entry(savedEntry.fileSystemPath, savedEntry.urlPrefix, savedEntry.pathPrefix, true);
+                var entry = new WebInspector.FileSystemMapping.Entry(fileSystemPath, savedEntry.urlPrefix, savedEntry.pathPrefix, true);

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

Why change this?

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

Done. (there were more changes)

                 fileSystemMappings.push(entry);
             }
         }
 
         this._rebuildIndexes();
     },
 
     _saveToSettings: function()
     {
         var setting = {};
@@ skipping 129 matching lines @@
             return null;
 
         var entry = null;
         for (var i = 0; i < entries.length; ++i) {
             var pathPrefix = entries[i].pathPrefix;
             if (entry && entry.configurable && !entries[i].configurable)
                 continue;
             // We are looking for the longest pathPrefix match.
             if (entry && entry.pathPrefix.length > pathPrefix.length)
                 continue;
-            if (filePath.startsWith(pathPrefix.substr(1)))
+            if (filePath.startsWith(pathPrefix))
                 entry = entries[i];
         }
         return entry;
     },
 
     /**
      * @param {string} fileSystemPath
      * @param {string} pathPrefix
      * @return {?WebInspector.FileSystemMapping.Entry}
      */
@@ skipping 40 matching lines @@
         return file;
     },
 
     /**
      * @param {string} fileSystemPath
      * @param {string} filePath
      * @return {string}
      */
     urlForPath: function(fileSystemPath, filePath)
     {
-        var entry = this._mappingEntryForPath(fileSystemPath, filePath);
+        var relativePath = filePath.substring("file://".length + fileSystemPath.length);
+        var entry = this._mappingEntryForPath(fileSystemPath, relativePath);
         if (!entry)
             return "";
-        return entry.urlPrefix + filePath.substring(entry.pathPrefix.length - 1);
+        return entry.urlPrefix + relativePath.substring(entry.pathPrefix.length);
     },
 
     /**
      * @param {string} url
      */
     removeMappingForURL: function(url)
     {
         var entry = this._mappingEntryForURL(url);
         if (!entry || !entry.configurable)
             return;
@@ skipping 43 matching lines @@
     this.fileSystemPath = fileSystemPath;
     this.urlPrefix = urlPrefix;
     this.pathPrefix = pathPrefix;
     this.configurable = configurable;
 }
 
 /**
  * @type {!WebInspector.FileSystemMapping}
  */
 WebInspector.fileSystemMapping;