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

Unified Diff: third_party/WebKit/Source/devtools/front_end/bindings/NetworkMapping.js

Issue 2349343002: DevTools: introduce persistence/ module (Closed)
Patch Set: reupload Created 4 years, 3 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/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 399a348a934231c4eb5fa88750d4150db5e5c9f7..58752dba821cc0e6e2da5a8bfec16c49d7b0cafa 100644
--- a/third_party/WebKit/Source/devtools/front_end/bindings/NetworkMapping.js
+++ b/third_party/WebKit/Source/devtools/front_end/bindings/NetworkMapping.js
@@ -21,10 +21,7 @@ WebInspector.NetworkMapping = function(targetManager, workspace, fileSystemWorks
this._eventListeners = [
fileSystemManager.addEventListener(WebInspector.IsolatedFileSystemManager.Events.FileSystemAdded, this._fileSystemAdded, this),
fileSystemManager.addEventListener(WebInspector.IsolatedFileSystemManager.Events.FileSystemRemoved, this._fileSystemRemoved, this),
- this._fileSystemMapping.addEventListener(WebInspector.FileSystemMapping.Events.FileMappingAdded, this._fileSystemMappingChanged, this),
- this._fileSystemMapping.addEventListener(WebInspector.FileSystemMapping.Events.FileMappingRemoved, this._fileSystemMappingChanged, this)
];
-
fileSystemManager.waitForFileSystems()
.then(this._fileSystemsLoaded.bind(this));
}
@@ -46,7 +43,6 @@ WebInspector.NetworkMapping.prototype = {
{
var fileSystem = /** @type {!WebInspector.IsolatedFileSystem} */ (event.data);
this._addMappingsForFilesystem(fileSystem);
- this._fileSystemMappingChanged();
},
/**
@@ -78,7 +74,6 @@ WebInspector.NetworkMapping.prototype = {
{
var fileSystem = /** @type {!WebInspector.IsolatedFileSystem} */ (event.data);
this._fileSystemMapping.removeFileSystem(fileSystem.path());
- this._fileSystemMappingChanged();
},
/**
@@ -87,23 +82,12 @@ WebInspector.NetworkMapping.prototype = {
*/
networkURL: function(uiSourceCode)
{
- if (uiSourceCode.project().type() === WebInspector.projectTypes.FileSystem) {
- var fileSystemPath = this._fileSystemWorkspaceBinding.fileSystemPath(uiSourceCode.project().id());
- return this._networkURLForFileSystemURL(fileSystemPath, uiSourceCode.url());
- }
+ if (uiSourceCode.project().type() === WebInspector.projectTypes.FileSystem)
+ return "";
return uiSourceCode.url();
},
/**
- * @param {string} url
- * @return {boolean}
- */
- hasMappingForNetworkURL: function(url)
- {
- return this._fileSystemMapping.hasMappingForNetworkURL(url);
- },
-
- /**
* @param {!WebInspector.Target} target
* @param {?WebInspector.ResourceTreeFrame} frame
* @param {string} url
@@ -126,20 +110,6 @@ WebInspector.NetworkMapping.prototype = {
},
/**
- * @param {string} url
- * @return {?WebInspector.UISourceCode}
- */
- _fileSystemUISourceCodeForURL: function(url)
- {
- var file = this._fileSystemMapping.fileForURL(url);
- if (file) {
- var projectId = WebInspector.FileSystemWorkspaceBinding.projectId(file.fileSystemPath);
- return this._workspace.uiSourceCode(projectId, file.fileURL);
- }
- return null;
- },
-
- /**
* @param {!WebInspector.Target} target
* @param {?WebInspector.ResourceTreeFrame} frame
* @param {string} url
@@ -147,7 +117,7 @@ WebInspector.NetworkMapping.prototype = {
*/
_uiSourceCodeForURL: function(target, frame, url)
{
- return this._fileSystemUISourceCodeForURL(url) || this._networkUISourceCodeForURL(target, frame, url) || this._contentScriptUISourceCodeForURL(target, frame, url);
+ return this._networkUISourceCodeForURL(target, frame, url) || this._contentScriptUISourceCodeForURL(target, frame, url);
},
/**
@@ -178,17 +148,7 @@ WebInspector.NetworkMapping.prototype = {
*/
uiSourceCodeForURLForAnyTarget: function(url)
{
- return this._fileSystemUISourceCodeForURL(url) || WebInspector.workspace.uiSourceCodeForURL(url);
- },
-
- /**
- * @param {string} fileSystemPath
- * @param {string} filePath
- * @return {string}
- */
- _networkURLForFileSystemURL: function(fileSystemPath, filePath)
- {
- return this._fileSystemMapping.networkURLForFileSystemURL(fileSystemPath, filePath);
+ return WebInspector.workspace.uiSourceCodeForURL(url);
},
/**
@@ -199,7 +159,7 @@ WebInspector.NetworkMapping.prototype = {
{
var url = this.networkURL(networkUISourceCode);
var path = uiSourceCode.url();
- var fileSystemPath = this._fileSystemWorkspaceBinding.fileSystemPath(uiSourceCode.project().id());
+ var fileSystemPath = WebInspector.FileSystemWorkspaceBinding.fileSystemPath(uiSourceCode.project().id());
this._fileSystemMapping.addMappingForResource(url, fileSystemPath, path);
},
@@ -243,13 +203,6 @@ WebInspector.NetworkMapping.prototype = {
this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, listener, this);
},
- _fileSystemMappingChanged: function()
- {
- if (this._addingFileSystem)
- return;
- this._targetManager.suspendAndResumeAllTargets();
- },
-
dispose: function()
{
WebInspector.EventTarget.removeEventListeners(this._eventListeners);

Powered by Google App Engine
This is Rietveld 408576698