DevTools: Make UISourceCode Target-agnostic

Source/devtools/front_end/sdk/ResourceScriptMapping.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 22 matching lines @@
  * @implements {WebInspector.ScriptSourceMapping}
  * @param {!WebInspector.DebuggerModel} debuggerModel
  * @param {!WebInspector.Workspace} workspace
  * @param {!WebInspector.DebuggerWorkspaceBinding} debuggerWorkspaceBinding
  */
 WebInspector.ResourceScriptMapping = function(debuggerModel, workspace, debuggerWorkspaceBinding)
 {
     this._target = debuggerModel.target();
     this._debuggerModel = debuggerModel;
     this._workspace = workspace;
-    this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, this._uiSourceCodeAddedToWorkspace, this);
+    this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, this._uiSourceCodeAdded, this);
     this._debuggerWorkspaceBinding = debuggerWorkspaceBinding;
     this._boundURLs = new StringSet();
 
+    /** @type {!Map.<!WebInspector.UISourceCode, !WebInspector.ResourceScriptFile>} */
+    this._uiSourceCodeToScriptFile = new Map();

[vsevik, 2014/08/13 07:02:04]

this map is never cleared.

[apavlov, 2014/08/13 07:20:43]

Done.

+
     debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.GlobalObjectCleared, this._debuggerReset, this);
 }
 
 WebInspector.ResourceScriptMapping.prototype = {
     /**
      * @param {!WebInspector.RawLocation} rawLocation
      * @return {?WebInspector.UILocation}
      */
     rawLocationToUILocation: function(rawLocation)
     {
         var debuggerModelLocation = /** @type {!WebInspector.DebuggerModel.Location} */ (rawLocation);
         var script = debuggerModelLocation.script();
         var uiSourceCode = this._workspaceUISourceCodeForScript(script);
         if (!uiSourceCode)
             return null;
-        var scriptFile = uiSourceCode.scriptFileForTarget(this._target);
+        var scriptFile = this.scriptFile(uiSourceCode);
         if (scriptFile && ((scriptFile.hasDivergedFromVM() && !scriptFile.isMergingToVM()) || scriptFile.isDivergingFromVM()))
             return null;
         return uiSourceCode.uiLocation(debuggerModelLocation.lineNumber, debuggerModelLocation.columnNumber || 0);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {number} lineNumber
      * @param {number} columnNumber
      * @return {?WebInspector.DebuggerModel.Location}
@@ skipping 32 matching lines @@
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {number} lineNumber
      * @return {boolean}
      */
     uiLineHasMapping: function(uiSourceCode, lineNumber)
     {
         return true;
     },
 
-    _uiSourceCodeAddedToWorkspace: function(event)
+    /**
+     * @param {!WebInspector.UISourceCode} uiSourceCode
+     * @return {?WebInspector.ResourceScriptFile}
+     */
+    scriptFile: function(uiSourceCode)
+    {
+        return this._uiSourceCodeToScriptFile.get(uiSourceCode) || null;
+    },
+
+    /**
+     * @param {!WebInspector.UISourceCode} uiSourceCode
+     * @param {?WebInspector.ResourceScriptFile} scriptFile
+     */
+    _setScriptFile: function(uiSourceCode, scriptFile)
+    {
+        if (scriptFile)
+            this._uiSourceCodeToScriptFile.put(uiSourceCode, scriptFile);
+        else
+            this._uiSourceCodeToScriptFile.remove(uiSourceCode);
+    },
+
+    /**
+     * @param {!WebInspector.Event} event
+     */
+    _uiSourceCodeAdded: function(event)
     {
         var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.data);
         if (uiSourceCode.project().isServiceProject())
             return;
         if (!uiSourceCode.url)
             return;
 
         var scripts = this._scriptsForUISourceCode(uiSourceCode);
         if (!scripts.length)
             return;
@@ skipping 48 matching lines @@
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {!Array.<!WebInspector.Script>} scripts
      */
     _bindUISourceCodeToScripts: function(uiSourceCode, scripts)
     {
         console.assert(scripts.length);
         var scriptFile = new WebInspector.ResourceScriptFile(this, uiSourceCode, scripts);
-        uiSourceCode.setScriptFileForTarget(this._target, scriptFile);
+        this._setScriptFile(uiSourceCode, scriptFile);
         for (var i = 0; i < scripts.length; ++i)
             this._debuggerWorkspaceBinding.updateLocations(scripts[i]);
-        uiSourceCode.setSourceMappingForTarget(this._target, this);
+        this._debuggerWorkspaceBinding.setSourceMapping(this._target, uiSourceCode, this);
         this._boundURLs.add(uiSourceCode.url);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     _unbindUISourceCode: function(uiSourceCode)
     {
-        var scriptFile = /** @type {!WebInspector.ResourceScriptFile} */ (uiSourceCode.scriptFileForTarget(this._target));
+        var scriptFile = this.scriptFile(uiSourceCode);
         if (scriptFile) {
             scriptFile.dispose();
-            uiSourceCode.setScriptFileForTarget(this._target, null);
+            this._setScriptFile(uiSourceCode, null);
         }
-        uiSourceCode.setSourceMappingForTarget(this._target, null);
+        this._debuggerWorkspaceBinding.setSourceMapping(this._target, uiSourceCode, null);
     },
 
     _debuggerReset: function()
     {
         var boundURLs = this._boundURLs.values();
         for (var i = 0; i < boundURLs.length; ++i)
         {
             var uiSourceCode = this._workspace.uiSourceCodeForURL(boundURLs[i]);
             if (!uiSourceCode)
                 continue;
             this._unbindUISourceCode(uiSourceCode);
         }
         this._boundURLs.clear();
     },
 
     dispose: function()
     {
         this._debuggerReset();
-        this._workspace.removeEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, this._uiSourceCodeAddedToWorkspace, this);
+        this._workspace.removeEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, this._uiSourceCodeAdded, this);
     }
 
 }
 
 /**
  * @constructor
  * @extends {WebInspector.Object}
  * @param {!WebInspector.ResourceScriptMapping} resourceScriptMapping
  * @param {!WebInspector.UISourceCode} uiSourceCode
  * @param {!Array.<!WebInspector.Script>} scripts
@@ skipping 157 matching lines @@
      */
     addSourceMapURL: function(sourceMapURL)
     {
         if (!this._script)
             return;
         this._script.addSourceMapURL(sourceMapURL);
     },
 
     __proto__: WebInspector.Object.prototype
 }