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

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: all tests pass 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

« third_party/WebKit/LayoutTests/inspector/sources/debugger/file-system-project-mapping.html ('K') | « third_party/WebKit/Source/devtools/front_end/bindings/ContentProviderBasedProject.js ('k') | third_party/WebKit/Source/devtools/front_end/bindings/FileSystemWorkspaceBinding.js » ('j') | third_party/WebKit/Source/devtools/front_end/bindings/FileSystemWorkspaceBinding.js » ('J')
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..170e6586981463fe79e4726aef1aa05157beaff4 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();

}

@@ -88,9 +88,9 @@ WebInspector.DefaultScriptMapping.prototype = {

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

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

dgozman 2015/12/16 07:58:30 name -> url?

pfeldman 2015/12/16 18:02:18 Done.

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

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

dgozman 2015/12/16 07:58:30 Why 3 slashes? I think there should be just 2 of t

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

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

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

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

this._project.addUISourceCodeWithProvider(uiSourceCode, script);