DevTools: fix disposing of main debugger script mappings

third_party/WebKit/Source/devtools/front_end/bindings/CompilerScriptMapping.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.NetworkMapping} networkMapping
  * @param {!WebInspector.NetworkProject} networkProject
  * @param {!WebInspector.DebuggerWorkspaceBinding} debuggerWorkspaceBinding
  */
 WebInspector.CompilerScriptMapping = function(debuggerModel, workspace, networkMapping, networkProject, debuggerWorkspaceBinding)
 {
     this._target = debuggerModel.target();
     this._debuggerModel = debuggerModel;
-    this._workspace = workspace;
-    this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, this._uiSourceCodeAddedToWorkspace, this);
     this._networkMapping = networkMapping;
     this._networkProject = networkProject;
     this._debuggerWorkspaceBinding = debuggerWorkspaceBinding;
 
     /** @type {!Map<string, !Promise<?WebInspector.TextSourceMap>>} */
     this._sourceMapLoadingPromises = new Map();
     /** @type {!Map<string, !WebInspector.TextSourceMap>} */
     this._sourceMapForScriptId = new Map();
     /** @type {!Map.<!WebInspector.TextSourceMap, !WebInspector.Script>} */
     this._scriptForSourceMap = new Map();
     /** @type {!Map.<string, !WebInspector.TextSourceMap>} */
     this._sourceMapForURL = new Map();
     /** @type {!Map.<string, !WebInspector.UISourceCode>} */
     this._stubUISourceCodes = new Map();
 
-    this._stubProjectID = "compiler-script-project";
-    this._stubProject = new WebInspector.ContentProviderBasedProject(this._workspace, this._stubProjectID, WebInspector.projectTypes.Service, "");
-    debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.GlobalObjectCleared, this._debuggerReset, this);
+    var projectId = WebInspector.CompilerScriptMapping.projectIdForTarget(this._target);

[dgozman, 2016/09/02 21:05:10]

Let's have a test for sourcemaps in multiple targets at the same time.

[lushnikov, 2016/09/08 01:32:04]

Sourcemaps actually work; the stubproject works too.

The problem is that the workspace should not allow adding projects with the same
ID.

I'll put an assert in a follow-up in the workspace.addProject to verify we do
not override
projects. Unfortunately, we do override projects a lot, so some code changes
need to be done.

+    this._stubProject = new WebInspector.ContentProviderBasedProject(workspace, projectId, WebInspector.projectTypes.Service, "");
+    this._eventListeners = [
+        workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, this._uiSourceCodeAddedToWorkspace, this),
+        debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.GlobalObjectCleared, this._debuggerReset, this)
+    ];
 }
 
-WebInspector.CompilerScriptMapping.StubProjectID = "compiler-script-project";
-
 WebInspector.CompilerScriptMapping._originSymbol = Symbol("origin");
 
 /**
  * @param {!WebInspector.UISourceCode} uiSourceCode
  * @return {?string}
  */
 WebInspector.CompilerScriptMapping.uiSourceCodeOrigin = function(uiSourceCode)
 {
     return uiSourceCode[WebInspector.CompilerScriptMapping._originSymbol] || null;
 }
@@ skipping 304 matching lines @@
         this._sourceMapForURL.valuesArray().forEach(unbindSourceMapSources.bind(this));
 
         this._sourceMapLoadingPromises.clear();
         this._sourceMapForScriptId.clear()
         this._scriptForSourceMap.clear();
         this._sourceMapForURL.clear();
     },
 
     dispose: function()
     {
-        this._workspace.removeEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, this._uiSourceCodeAddedToWorkspace, this);
+        WebInspector.EventTarget.removeEventListeners(this._eventListeners);
+        this._debuggerReset();
+        this._stubProject.dispose();
     }
 }
+
+/**
+ * @param {!WebInspector.Target} target
+ * @return {string}
+ */
+WebInspector.CompilerScriptMapping.projectIdForTarget = function(target)
+{
+    return "compiler-script-project:" + target.id();
+}