Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(597)

Unified Diff: third_party/WebKit/Source/devtools/front_end/workspace/IsolatedFileSystemManager.js

Issue 2422803002: DevTools: prefix node.js scripts's sourceURL with "file://" to make them a valid url (Closed)
Patch Set: WI.ParsedURL.platformPathToURL Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/devtools/front_end/workspace/IsolatedFileSystemManager.js
diff --git a/third_party/WebKit/Source/devtools/front_end/workspace/IsolatedFileSystemManager.js b/third_party/WebKit/Source/devtools/front_end/workspace/IsolatedFileSystemManager.js
index ee17a3a8c94f2378517d51c1952a5c4e4f92d8d5..a78b36ca1b7c8daa17482f90a8f304a6fcfb811e 100644
--- a/third_party/WebKit/Source/devtools/front_end/workspace/IsolatedFileSystemManager.js
+++ b/third_party/WebKit/Source/devtools/front_end/workspace/IsolatedFileSystemManager.js
@@ -70,22 +70,6 @@ WebInspector.IsolatedFileSystemManager.Events = {
WebInspector.IsolatedFileSystemManager._lastRequestId = 0;
-/**
- * @param {string} fileSystemPath
- * @return {string}
- */
-WebInspector.IsolatedFileSystemManager.normalizePath = function(fileSystemPath)
-{
- fileSystemPath = fileSystemPath.replace(/\\/g, "/");
- if (!fileSystemPath.startsWith("file://")) {
- if (fileSystemPath.startsWith("/"))
- fileSystemPath = "file://" + fileSystemPath;
- else
- fileSystemPath = "file:///" + fileSystemPath;
- }
- return fileSystemPath;
-}
-
WebInspector.IsolatedFileSystemManager.prototype = {
/**
* @return {!Promise<!Array<!WebInspector.IsolatedFileSystem>>}
@@ -149,8 +133,8 @@ WebInspector.IsolatedFileSystemManager.prototype = {
_innerAddFileSystem: function(fileSystem, dispatchEvent)
{
var embedderPath = fileSystem.fileSystemPath;
- var fileSystemPath = WebInspector.IsolatedFileSystemManager.normalizePath(fileSystem.fileSystemPath);
- var promise = WebInspector.IsolatedFileSystem.create(this, fileSystemPath, embedderPath, fileSystem.fileSystemName, fileSystem.rootURL);
+ var fileSystemURL = WebInspector.ParsedURL.platformPathToURL(fileSystem.fileSystemPath);
+ var promise = WebInspector.IsolatedFileSystem.create(this, fileSystemURL, embedderPath, fileSystem.fileSystemName, fileSystem.rootURL);
return promise.then(storeFileSystem.bind(this));
/**
@@ -161,7 +145,7 @@ WebInspector.IsolatedFileSystemManager.prototype = {
{
if (!fileSystem)
return null;
- this._fileSystems.set(fileSystemPath, fileSystem);
+ this._fileSystems.set(fileSystemURL, fileSystem);
if (dispatchEvent)
this.dispatchEventToListeners(WebInspector.IsolatedFileSystemManager.Events.FileSystemAdded, fileSystem);
return fileSystem;
@@ -187,7 +171,7 @@ WebInspector.IsolatedFileSystemManager.prototype = {
_onFileSystemRemoved: function(event)
{
var embedderPath = /** @type {string} */ (event.data);
- var fileSystemPath = WebInspector.IsolatedFileSystemManager.normalizePath(embedderPath);
+ var fileSystemPath = WebInspector.ParsedURL.platformPathToURL(embedderPath);
var isolatedFileSystem = this._fileSystems.get(fileSystemPath);
if (!isolatedFileSystem)
return;
@@ -202,7 +186,7 @@ WebInspector.IsolatedFileSystemManager.prototype = {
_onFileSystemFilesChanged: function(event)
{
var embedderPaths = /** @type {!Array<string>} */ (event.data);
- var paths = embedderPaths.map(embedderPath => WebInspector.IsolatedFileSystemManager.normalizePath(embedderPath));
+ var paths = embedderPaths.map(embedderPath => WebInspector.ParsedURL.platformPathToURL(embedderPath));
this.dispatchEventToListeners(WebInspector.IsolatedFileSystemManager.Events.FileSystemFilesChanged, paths);
},

Powered by Google App Engine
This is Rietveld 408576698