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

Unified Diff: third_party/WebKit/Source/devtools/front_end/bindings/CompilerScriptMapping.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/LayoutTests/inspector/workspace-mapping-expected.txt ('k') | third_party/WebKit/Source/devtools/front_end/bindings/ContentProviderBasedProject.js » ('j') | third_party/WebKit/Source/devtools/front_end/bindings/DefaultScriptMapping.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 81c7efb004a22dbfd5d6402678338e357014557e..b4378d7bc6bc738f31f58c37cd9214f44775bfef 100644

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

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

@@ -61,7 +61,7 @@ WebInspector.CompilerScriptMapping = function(debuggerModel, workspace, networkM

this._stubUISourceCodes = new Map();

this._stubProjectID = "compiler-script-project";

- this._stubProject = new WebInspector.ContentProviderBasedProject(this._workspace, this._stubProjectID, WebInspector.projectTypes.Service, "", "");

+ this._stubProject = new WebInspector.ContentProviderBasedProject(this._workspace, this._stubProjectID, WebInspector.projectTypes.Service, "");

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

}

@@ -162,11 +162,7 @@ WebInspector.CompilerScriptMapping.prototype = {

_processScript: function(script)

{

// Create stub UISourceCode for the time source mapping is being loaded.

- var url = script.sourceURL;

- var splitURL = WebInspector.ParsedURL.splitURLIntoPathComponents(url);

- var parentPath = splitURL.slice(1, -1).join("/");

- var name = splitURL.peekLast() || "";

- var stubUISourceCode = this._stubProject.addContentProvider(parentPath, name, url, new WebInspector.StaticContentProvider(WebInspector.resourceTypes.Script, "\n\n\n\n\n// Please wait a bit.\n// Compiled script is not shown while source map is being loaded!", url));

+ var stubUISourceCode = this._stubProject.addContentProvider(script.sourceURL, new WebInspector.StaticContentProvider(WebInspector.resourceTypes.Script, "\n\n\n\n\n// Please wait a bit.\n// Compiled script is not shown while source map is being loaded!", script.sourceURL));

this._stubUISourceCodes.set(script.scriptId, stubUISourceCode);

this._debuggerWorkspaceBinding.pushSourceMapping(script, this);