DevTools: Decouple debugger model from UI entities

Source/devtools/front_end/sdk/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 16 matching lines @@
  * (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}
  * @param {!WebInspector.DebuggerModel} debuggerModel
  * @param {!WebInspector.Workspace} workspace
  * @param {!WebInspector.NetworkWorkspaceBinding} networkWorkspaceBinding
+ * @param {!WebInspector.DebuggerWorkspaceBinding} debuggerWorkspaceBinding
  */
-WebInspector.CompilerScriptMapping = function(debuggerModel, workspace, networkWorkspaceBinding)
+WebInspector.CompilerScriptMapping = function(debuggerModel, workspace, networkWorkspaceBinding, debuggerWorkspaceBinding)
 {
     this._target = debuggerModel.target();
     this._debuggerModel = debuggerModel;
     this._workspace = workspace;
     this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, this._uiSourceCodeAddedToWorkspace, this);
     this._networkWorkspaceBinding = networkWorkspaceBinding;
+    this._debuggerWorkspaceBinding = debuggerWorkspaceBinding;
+
     /** @type {!Object.<string, !WebInspector.SourceMap>} */
     this._sourceMapForSourceMapURL = {};
     /** @type {!Object.<string, !Array.<function(?WebInspector.SourceMap)>>} */
     this._pendingSourceMapLoadingCallbacks = {};
     /** @type {!Object.<string, !WebInspector.SourceMap>} */
     this._sourceMapForScriptId = {};
     /** @type {!Map.<!WebInspector.SourceMap, !WebInspector.Script>} */
     this._scriptForSourceMap = new Map();
     /** @type {!StringMap.<!WebInspector.SourceMap>} */
     this._sourceMapForURL = new StringMap();
@@ skipping 44 matching lines @@
         if (!entry)
             return null;
         return this._debuggerModel.createRawLocation(script, /** @type {number} */ (entry[0]), /** @type {number} */ (entry[1]));
     },
 
     /**
      * @param {!WebInspector.Script} script
      */
     addScript: function(script)
     {
-        script.pushSourceMapping(this);
+        this._debuggerWorkspaceBinding.pushSourceMapping(script, this);
         script.addEventListener(WebInspector.Script.Events.SourceMapURLAdded, this._sourceMapURLAdded.bind(this));
         this._processScript(script);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _sourceMapURLAdded: function(event)
     {
         var script = /** @type {!WebInspector.Script} */ (event.target);
@@ skipping 11 matching lines @@
          * @param {?WebInspector.SourceMap} sourceMap
          * @this {WebInspector.CompilerScriptMapping}
          */
         function sourceMapLoaded(sourceMap)
         {
             if (!sourceMap)
                 return;
 
             if (this._scriptForSourceMap.get(sourceMap)) {
                 this._sourceMapForScriptId[script.scriptId] = sourceMap;
-                script.updateLocations();
+                this._debuggerWorkspaceBinding.updateLocations(script);
                 return;
             }
 
             this._sourceMapForScriptId[script.scriptId] = sourceMap;
             this._scriptForSourceMap.put(sourceMap, script);
 
             var sourceURLs = sourceMap.sources();
             for (var i = 0; i < sourceURLs.length; ++i) {
                 var sourceURL = sourceURLs[i];
                 if (this._sourceMapForURL.get(sourceURL))
                     continue;
                 this._sourceMapForURL.put(sourceURL, sourceMap);
                 if (!this._workspace.hasMappingForURL(sourceURL) && !this._workspace.uiSourceCodeForURL(sourceURL)) {
                     var contentProvider = sourceMap.sourceContentProvider(sourceURL, WebInspector.resourceTypes.Script);
                     this._networkWorkspaceBinding.addFileForURL(sourceURL, contentProvider, script.isContentScript());
                 }
                 var uiSourceCode = this._workspace.uiSourceCodeForURL(sourceURL);
                 if (uiSourceCode)
                     this._bindUISourceCode(uiSourceCode);
                 else
                     WebInspector.console.error(WebInspector.UIString("Failed to locate workspace file mapped to URL %s from source map %s", sourceURL, sourceMap.url()));
             }
-            script.updateLocations();
+            this._debuggerWorkspaceBinding.updateLocations(script);
         }
     },
 
     /**
      * @return {boolean}
      */
     isIdentity: function()
     {
         return false;
     },
@@ skipping 119 matching lines @@
         this._sourceMapForScriptId = {};
         this._scriptForSourceMap.clear();
         this._sourceMapForURL.clear();
     },
 
     dispose: function()
     {
         this._workspace.removeEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, this._uiSourceCodeAddedToWorkspace, this);
     }
 }