DevTools: merge UISourceCode's parentPath, name, originURL and uri.

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

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 23 matching lines @@
  * @param {!WebInspector.DebuggerModel} debuggerModel
  * @param {!WebInspector.Workspace} workspace
  * @param {!WebInspector.DebuggerWorkspaceBinding} debuggerWorkspaceBinding
  */
 WebInspector.DefaultScriptMapping = function(debuggerModel, workspace, debuggerWorkspaceBinding)
 {
     this._debuggerModel = debuggerModel;
     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();
 }
 
 WebInspector.DefaultScriptMapping.prototype = {
     /**
      * @override
      * @param {!WebInspector.DebuggerModel.Location} rawLocation
      * @return {!WebInspector.UILocation}
      */
@@ skipping 25 matching lines @@
         return this._debuggerModel.createRawLocation(script, lineNumber, columnNumber);
     },
 
     /**
      * @param {!WebInspector.Script} script
      */
     addScript: function(script)
     {
 
         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 them.

 
-        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);
 
         this._debuggerWorkspaceBinding.setSourceMapping(this._debuggerModel.target(), uiSourceCode, this);
         this._debuggerWorkspaceBinding.pushSourceMapping(script, this);
     },
 
     /**
      * @override
@@ skipping 30 matching lines @@
 }
 
 /**
  * @param {!WebInspector.Target} target
  * @return {string}
  */
 WebInspector.DefaultScriptMapping.projectIdForTarget = function(target)
 {
     return "debugger:" + target.id();
 }