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

Unified Diff: Source/devtools/front_end/bindings/NetworkProject.js

Issue 1147093007: Devtools[ResourceScriptMapping]: Ignore uiSourceCodes originated by other target's network project (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase test results Created 5 years, 7 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: Source/devtools/front_end/bindings/NetworkProject.js
diff --git a/Source/devtools/front_end/bindings/NetworkProject.js b/Source/devtools/front_end/bindings/NetworkProject.js
index c85df163db92395663f32a4b5f19056253c010c5..33364e77c63400490bb9d0ee2f4217dac6eea841 100644
--- a/Source/devtools/front_end/bindings/NetworkProject.js
+++ b/Source/devtools/front_end/bindings/NetworkProject.js
@@ -117,7 +117,6 @@ WebInspector.NetworkProjectManager = function(targetManager, workspace, networkM
{
this._workspace = workspace;
this._networkMapping = networkMapping;
- this._projectSymbol = Symbol("networkProject");
targetManager.observeTargets(this);
}
@@ -173,7 +172,6 @@ WebInspector.NetworkProject = function(target, workspace, networkMapping)
}
WebInspector.NetworkProject._networkProjectSymbol = Symbol("networkProject");
-WebInspector.NetworkProject._targetSymbol = Symbol("target");
WebInspector.NetworkProject._contentTypeSymbol = Symbol("networkContentType");
/**
@@ -188,6 +186,16 @@ WebInspector.NetworkProject.projectId = function(target, projectURL, isContentSc
}
/**
+ * @param {!WebInspector.Project} project
+ * @return {?WebInspector.Target}
+ */
+WebInspector.NetworkProject._targetForProject = function(project)
+{
+ var targetId = parseInt(project.id(), 10);
+ return WebInspector.targetManager.targetById(targetId);
+}
+
+/**
* @param {!WebInspector.Target} target
* @return {!WebInspector.NetworkProject}
*/
@@ -202,7 +210,10 @@ WebInspector.NetworkProject.forTarget = function(target)
*/
WebInspector.NetworkProject.targetForUISourceCode = function(uiSourceCode)
{
- return uiSourceCode[WebInspector.NetworkProject._targetSymbol];
+ if (uiSourceCode.project().type() !== WebInspector.projectTypes.ContentScripts && uiSourceCode.project().type() !== WebInspector.projectTypes.Network)
+ return null;
+
+ return WebInspector.NetworkProject._targetForProject(uiSourceCode.project());
}
/**
@@ -247,7 +258,6 @@ WebInspector.NetworkProject.prototype = {
var projectDelegate = this._projectDelegate(projectURL, isContentScript || false);
var path = projectDelegate.addFile(parentPath, name, url, contentProvider);
var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (this._workspace.uiSourceCode(projectDelegate.id(), path));
- uiSourceCode[WebInspector.NetworkProject._targetSymbol] = this.target();
console.assert(uiSourceCode);
return uiSourceCode;
},

Powered by Google App Engine
This is Rietveld 408576698