third_party/WebKit/Source/devtools/front_end/bindings/DefaultScriptMapping.js - Issue 1523193002: DevTools: merge UISourceCode's parentPath, name, originURL and uri.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1523193002: DevTools: merge UISourceCode's parentPath, name, originURL and uri. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebaselined Created 5 years 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 | « third_party/WebKit/Source/devtools/front_end/bindings/ContentProviderBasedProject.js ('k') | third_party/WebKit/Source/devtools/front_end/bindings/FileSystemWorkspaceBinding.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/devtools/front_end/bindings/DefaultScriptMapping.js

diff --git a/third_party/WebKit/Source/devtools/front_end/bindings/DefaultScriptMapping.js b/third_party/WebKit/Source/devtools/front_end/bindings/DefaultScriptMapping.js

index 85ea5cb6838f0288e048804f421c5de3a6010af5..a004fd5f033d39a4e8b39a14c3c79159900d8f26 100644

--- a/third_party/WebKit/Source/devtools/front_end/bindings/DefaultScriptMapping.js

+++ b/third_party/WebKit/Source/devtools/front_end/bindings/DefaultScriptMapping.js

@@ -41,7 +41,7 @@ WebInspector.DefaultScriptMapping = function(debuggerModel, workspace, debuggerW

this._debuggerWorkspaceBinding = debuggerWorkspaceBinding;

this._workspace = workspace;

this._projectId = WebInspector.DefaultScriptMapping.projectIdForTarget(debuggerModel.target());

- this._project = new WebInspector.ContentProviderBasedProject(this._workspace, this._projectId, WebInspector.projectTypes.Debugger, "debugger:", "");

+ this._project = new WebInspector.ContentProviderBasedProject(this._workspace, this._projectId, WebInspector.projectTypes.Debugger, "");

debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.GlobalObjectCleared, this._debuggerReset, this);

this._debuggerReset();

}

@@ -87,10 +87,10 @@ WebInspector.DefaultScriptMapping.prototype = {

{

var splitURL = WebInspector.ParsedURL.splitURLIntoPathComponents(script.sourceURL);

- var name = splitURL[splitURL.length - 1];

- name = "VM" + script.scriptId + (name ? " " + name : "");

+ var url = splitURL[splitURL.length - 1];

+ url = "debugger:///VM" + script.scriptId + (url ? " " + url: "");

- var uiSourceCode = this._project.createUISourceCode("", name, script.sourceURL, WebInspector.resourceTypes.Script);

+ var uiSourceCode = this._project.createUISourceCode(url, WebInspector.resourceTypes.Script);

this._uiSourceCodeForScriptId.set(script.scriptId, uiSourceCode);

this._scriptIdForUISourceCode.set(uiSourceCode, script.scriptId);

this._project.addUISourceCodeWithProvider(uiSourceCode, script);