DevTools: remove setScriptFile from UISourceCode.

Source/devtools/front_end/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 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
  * @constructor
- * @implements {WebInspector.ScriptSourceMapping}
+ */
+WebInspector.SourceMappingWithScriptFile = function()
+{
+}
+
+WebInspector.SourceMappingWithScriptFile.prototype = {
+    /**
+     * @param {!WebInspector.UISourceCode} uiSourceCode
+     * @return {?WebInspector.ScriptFile}
+     */
+    scriptFile: function(uiSourceCode)
+    {
+        return null;
+    }
+}
+
+/**
+ * @constructor
+ * @extends {WebInspector.SourceMappingWithScriptFile}
+ * @implements {WebInspector.SourceMapping}
  * @param {!WebInspector.DebuggerModel} debuggerModel
  * @param {!WebInspector.Workspace} workspace
  */
 WebInspector.ResourceScriptMapping = function(debuggerModel, workspace)
 {
+    WebInspector.SourceMappingWithScriptFile.call(this);
+
     this._debuggerModel = debuggerModel;
     this._workspace = workspace;
     this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, this._uiSourceCodeAddedToWorkspace, this);
     this._boundURLs = new StringSet();
+    /** @type {!Map.<!WebInspector.UISourceCode, !WebInspector.ResourceScriptFile>} */
+    this._scriptFiles = new Map();
 
     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.scriptFile();
+        var scriptFile = /** @type {?WebInspector.ResourceScriptFile} */ (this._scriptFiles.get(uiSourceCode));
         if (scriptFile && ((scriptFile.hasDivergedFromVM() && !scriptFile.isMergingToVM()) || scriptFile.isDivergingFromVM()))
             return null;
         return new WebInspector.UILocation(uiSourceCode, debuggerModelLocation.lineNumber, debuggerModelLocation.columnNumber || 0);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {number} lineNumber
      * @param {number} columnNumber
      * @return {?WebInspector.DebuggerModel.Location}
@@ skipping 90 matching lines @@
         return this._debuggerModel.scriptsForSourceURL(uiSourceCode.url);
     },
 
     /**
      * @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.setScriptFile(scriptFile);
+        this._scriptFiles.put(uiSourceCode, new WebInspector.ResourceScriptFile(this, uiSourceCode, scripts));
         for (var i = 0; i < scripts.length; ++i)
             scripts[i].updateLocations();
         uiSourceCode.setSourceMapping(this);
         this._boundURLs.add(uiSourceCode.url);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     _unbindUISourceCode: function(uiSourceCode)
     {
-        var scriptFile = /** @type {!WebInspector.ResourceScriptFile} */ (uiSourceCode.scriptFile());
+        var scriptFile = /** @type {?WebInspector.ResourceScriptFile} */ (this._scriptFiles.get(uiSourceCode));
         if (scriptFile) {
             scriptFile.dispose();
-            uiSourceCode.setScriptFile(null);
+            this._scriptFiles.remove(uiSourceCode);
         }
         uiSourceCode.setSourceMapping(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();
+        this._scriptFiles.clear();
     },
+
+    /**
+     * @param {!WebInspector.UISourceCode} uiSourceCode
+     * @return {?WebInspector.ResourceScriptFile}
+     */
+    scriptFile: function(uiSourceCode)
+    {
+        return this._scriptFiles.get(uiSourceCode) || null;

[vsevik, 2014/04/09 10:39:42]

|| null is redundant

+    },
+
+    __proto__: WebInspector.SourceMappingWithScriptFile.prototype
 }
 
 /**
  * @interface
  * @extends {WebInspector.EventTarget}
  */
 WebInspector.ScriptFile = function()
 {
 }
 
@@ skipping 162 matching lines @@
     },
 
     dispose: function()
     {
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.WorkingCopyCommitted, this._workingCopyCommitted, this);
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.WorkingCopyChanged, this._workingCopyChanged, this);
     },
 
     __proto__: WebInspector.Object.prototype
 }