DevTools: remove setScriptFile from UISourceCode.

Source/devtools/front_end/ScriptSnippetModel.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 26 matching lines @@
 {
     this._workspace = workspace;
     /** @type {!Object.<string, !WebInspector.UISourceCode>} */
     this._uiSourceCodeForScriptId = {};
     /** @type {!Map.<!WebInspector.UISourceCode, !WebInspector.Script>} */
     this._scriptForUISourceCode = new Map();
     /** @type {!Object.<string, !WebInspector.UISourceCode>} */
     this._uiSourceCodeForSnippetId = {};
     /** @type {!Map.<!WebInspector.UISourceCode, string>} */
     this._snippetIdForUISourceCode = new Map();
-    
+    /** @type {!Map.<!WebInspector.UISourceCode, !WebInspector.SnippetScriptFile>} */
+    this._scriptFiles = new Map();
+
     this._snippetStorage = new WebInspector.SnippetStorage("script", "Script snippet #");
     this._lastSnippetEvaluationIndexSetting = WebInspector.settings.createSetting("lastSnippetEvaluationIndex", 0);
     this._snippetScriptMapping = new WebInspector.SnippetScriptMapping(this);
     this._projectDelegate = new WebInspector.SnippetsProjectDelegate(this);
     this._project = this._workspace.addProject(this._projectDelegate);
     this.reset();
     WebInspector.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.GlobalObjectCleared, this._debuggerReset, this);
 }
 
 WebInspector.ScriptSnippetModel.prototype = {
@@ skipping 36 matching lines @@
      * @return {string}
      */
     _addScriptSnippet: function(snippet)
     {
         var path = this._projectDelegate.addSnippet(snippet.name, new WebInspector.SnippetContentProvider(snippet));
         var uiSourceCode = this._workspace.uiSourceCode(this._projectDelegate.id(), path);
         if (!uiSourceCode) {
             console.assert(uiSourceCode);
             return "";
         }
-        var scriptFile = new WebInspector.SnippetScriptFile(this, uiSourceCode);
-        uiSourceCode.setScriptFile(scriptFile);
+        this._scriptFiles.put(uiSourceCode, new WebInspector.SnippetScriptFile(this, uiSourceCode));
         this._snippetIdForUISourceCode.put(uiSourceCode, snippet.id);
         uiSourceCode.setSourceMapping(this._snippetScriptMapping);
         this._uiSourceCodeForSnippetId[snippet.id] = uiSourceCode;
         return path;
     },
 
     /**
      * @param {string} path
      */
     deleteScriptSnippet: function(path)
@@ skipping 205 matching lines @@
         if (!snippetId)
             return;
         var uiSourceCode = this._uiSourceCodeForSnippetId[snippetId];
 
         if (!uiSourceCode || this._evaluationSourceURL(uiSourceCode) !== script.sourceURL)
             return;
 
         console.assert(!this._scriptForUISourceCode.get(uiSourceCode));
         this._uiSourceCodeForScriptId[script.scriptId] = uiSourceCode;
         this._scriptForUISourceCode.put(uiSourceCode, script);
-        uiSourceCode.scriptFile().setHasDivergedFromVM(false);
+        var scriptFile = /** @type {?WebInspector.SnippetScriptFile} */ (this._scriptFiles.get(uiSourceCode));
+        scriptFile.setHasDivergedFromVM(false);
         script.pushSourceMapping(this._snippetScriptMapping);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @return {!Array.<!Object>}
      */
     _removeBreakpoints: function(uiSourceCode)
     {
         var breakpointLocations = WebInspector.breakpointManager.breakpointLocationsForUISourceCode(uiSourceCode);
@@ skipping 16 matching lines @@
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     _releaseSnippetScript: function(uiSourceCode)
     {
         var script = this._scriptForUISourceCode.get(uiSourceCode);
         if (!script)
             return null;
-
-        uiSourceCode.scriptFile().setIsDivergingFromVM(true);
-        uiSourceCode.scriptFile().setHasDivergedFromVM(true);
+        var scriptFile = /** @type {?WebInspector.SnippetScriptFile} */ (this._scriptFiles.get(uiSourceCode));

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

No need to cast, since you don't store anything else in this map.

+        scriptFile.setIsDivergingFromVM(true);
+        scriptFile.setHasDivergedFromVM(true);
         delete this._uiSourceCodeForScriptId[script.scriptId];
         this._scriptForUISourceCode.remove(uiSourceCode);
         delete uiSourceCode._evaluationIndex;
-        uiSourceCode.scriptFile().setIsDivergingFromVM(false);
+        scriptFile.setIsDivergingFromVM(false);
     },
 
     _debuggerReset: function()
     {
         for (var snippetId in this._uiSourceCodeForSnippetId) {
             var uiSourceCode = this._uiSourceCodeForSnippetId[snippetId];
             this._releaseSnippetScript(uiSourceCode);
         }
     },
 
@@ skipping 101 matching lines @@
     _workingCopyChanged: function()
     {
         this._scriptSnippetModel._scriptSnippetEdited(this._uiSourceCode);
     },
 
     __proto__: WebInspector.Object.prototype
 }
 
 /**
  * @constructor
- * @implements {WebInspector.ScriptSourceMapping}
+ * @extends {WebInspector.SourceMappingWithScriptFile}
+ * @implements {WebInspector.SourceMapping}
  * @param {!WebInspector.ScriptSnippetModel} scriptSnippetModel
  */
 WebInspector.SnippetScriptMapping = function(scriptSnippetModel)
 {
+    WebInspector.SourceMappingWithScriptFile.call(this);
     this._scriptSnippetModel = scriptSnippetModel;
 }
 
 WebInspector.SnippetScriptMapping.prototype = {
     /**
      * @param {!WebInspector.RawLocation} rawLocation
      * @return {?WebInspector.UILocation}
      */
     rawLocationToUILocation: function(rawLocation)
     {
@@ skipping 29 matching lines @@
         this._scriptSnippetModel._addScript(script);
     },
 
     /**
      * @return {boolean}
      */
     isIdentity: function()
     {
         return false;
     },
+
+    /**
+     * @param {!WebInspector.UISourceCode} uiSourceCode
+     * @return {?WebInspector.SnippetScriptFile}
+     */
+    scriptFile: function(uiSourceCode)
+    {
+        return this._scriptSnippetModel._scriptFiles.get(uiSourceCode) || null;
+    },
+
+    __proto__: WebInspector.SourceMappingWithScriptFile.prototype
 }
 
 /**
  * @constructor
  * @implements {WebInspector.ContentProvider}
  * @param {!WebInspector.Snippet} snippet
  */
 WebInspector.SnippetContentProvider = function(snippet)
 {
     this._snippet = snippet;
@@ skipping 133 matching lines @@
         this._model.deleteScriptSnippet(path);
     },
 
     __proto__: WebInspector.ContentProviderBasedProjectDelegate.prototype
 }
 
 /**
  * @type {!WebInspector.ScriptSnippetModel}
  */
 WebInspector.scriptSnippetModel;