Source/devtools/front_end/bindings/NetworkProject.js - Issue 1147093007: Devtools[ResourceScriptMapping]: Ignore uiSourceCodes originated by other target's network project

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 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

« no previous file with comments | « LayoutTests/inspector/console/worker-exception-message-contains-stack.html ('k') | Source/devtools/front_end/bindings/ResourceScriptMapping.js » ('j') | Source/devtools/front_end/sdk/Target.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..088bea8ab75e27695f65a2d7789fcc624962414b 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");

/**

@@ -202,7 +200,12 @@ 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;

+ var projectId = uiSourceCode.project().id();

pfeldman 2015/05/26 13:03:33 extract WebInspector.NetworkProject.targetForProje

sergeyv 2015/05/26 13:53:17 Done.

+ var targetId = parseInt(projectId.substring(0, projectId.indexOf(":")), 10);

pfeldman 2015/05/26 13:03:33 no need to substring.

sergeyv 2015/05/26 13:53:17 Done.

+ return WebInspector.targetManager.targetById(targetId);

}

/**

@@ -247,7 +250,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;