DevTools: Decouple debugger model from UI entities

Source/devtools/front_end/sdk/BreakpointManager.js

 /*
  * Copyright (C) 2011 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 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
  * @constructor
  * @extends {WebInspector.Object}
  * @implements {WebInspector.TargetManager.Observer}
  * @param {!WebInspector.Setting} breakpointStorage
  * @param {!WebInspector.Workspace} workspace
  * @param {!WebInspector.TargetManager} targetManager
+ * @param {!WebInspector.DebuggerWorkspaceBinding} debuggerWorkspaceBinding
  */
-WebInspector.BreakpointManager = function(breakpointStorage, workspace, targetManager)
+WebInspector.BreakpointManager = function(breakpointStorage, workspace, targetManager, debuggerWorkspaceBinding)
 {
     this._storage = new WebInspector.BreakpointManager.Storage(this, breakpointStorage);
     this._workspace = workspace;
     this._targetManager = targetManager;
+    this._debuggerWorkspaceBinding = debuggerWorkspaceBinding;
 
     this._breakpointsActive = true;
     this._breakpointsForUISourceCode = new Map();
     this._breakpointsForPrimaryUISourceCode = new Map();
     /** @type {!StringMultimap.<!WebInspector.BreakpointManager.Breakpoint>} */
     this._provisionalBreakpoints = new StringMultimap();
 
     this._workspace.addEventListener(WebInspector.Workspace.Events.ProjectRemoved, this._projectRemoved, this);
     this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, this._uiSourceCodeAdded, this);
     this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeRemoved, this._uiSourceCodeRemoved, this);
@@ skipping 426 matching lines @@
     this._updateState(condition, enabled);
     this._breakpointManager._targetManager.observeTargets(this);
 }
 
 WebInspector.BreakpointManager.Breakpoint.prototype = {
     /**
      * @param {!WebInspector.Target} target
      */
     targetAdded: function(target)
     {
-        this._targetBreakpoints.put(target, new WebInspector.BreakpointManager.TargetBreakpoint(target, this));
+        this._targetBreakpoints.put(target, new WebInspector.BreakpointManager.TargetBreakpoint(target, this, this._breakpointManager._debuggerWorkspaceBinding));
     },
 
     /**
      * @param {!WebInspector.Target} target
      */
     targetRemoved: function(target)
     {
         var targetBreakpoint = this._targetBreakpoints.remove(target);
         targetBreakpoint._cleanUpAfterDebuggerIsGone();
         targetBreakpoint._removeEventListeners();
@@ skipping 191 matching lines @@
         for (var i = 0; i < targetBreakpoints.length; ++i)
             targetBreakpoints[i]._resetLocations();
     }
 }
 
 /**
  * @constructor
  * @extends {WebInspector.SDKObject}
  * @param {!WebInspector.Target} target
  * @param {!WebInspector.BreakpointManager.Breakpoint} breakpoint
+ * @param {!WebInspector.DebuggerWorkspaceBinding} debuggerWorkspaceBinding
  */
-WebInspector.BreakpointManager.TargetBreakpoint = function(target, breakpoint)
+WebInspector.BreakpointManager.TargetBreakpoint = function(target, breakpoint, debuggerWorkspaceBinding)
 {
     WebInspector.SDKObject.call(this, target);
     this._breakpoint = breakpoint;
-    /** @type {!Array.<!WebInspector.Script.Location>} */
+    this._debuggerWorkspaceBinding = debuggerWorkspaceBinding;
+
+    /** @type {!Array.<!WebInspector.DebuggerWorkspaceBinding.Location>} */
     this._liveLocations = [];
 
     /** @type {!Object.<string, !WebInspector.UILocation>} */
     this._uiLocations = {};
     target.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerWasDisabled, this._cleanUpAfterDebuggerIsGone, this);
     target.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerWasEnabled, this._scheduleUpdateInDebugger, this);
     this._hasPendingUpdate = false;
     this._isUpdating = false;
     this._currentState = null;
     if (target.debuggerModel.debuggerEnabled())
@@ skipping 48 matching lines @@
     _scriptDiverged: function()
     {
         var uiSourceCode = this._breakpoint.uiSourceCode();
         if (!uiSourceCode)
             return false;
         var scriptFile = uiSourceCode.scriptFileForTarget(this.target());
         return !!scriptFile && scriptFile.hasDivergedFromVM();
 
     },
 
+    /**
+     * @param {function()} callback
+     */
     _updateInDebugger: function(callback)
     {
+        if (this.target().isDetached()) {
+            this._cleanUpAfterDebuggerIsGone();
+            callback();
+            return;
+        }
+
         var uiSourceCode = this._breakpoint.uiSourceCode();
         var lineNumber = this._breakpoint._lineNumber;
         var columnNumber = this._breakpoint._columnNumber;
         var condition = this._breakpoint.condition();
 
-        var debuggerLocation = uiSourceCode ? WebInspector.debuggerWorkspaceBinding.uiLocationToRawLocation(this.target(), uiSourceCode, lineNumber, columnNumber) : null;
+        var debuggerLocation = uiSourceCode ? this._debuggerWorkspaceBinding.uiLocationToRawLocation(this.target(), uiSourceCode, lineNumber, columnNumber) : null;
         var newState;
         if (this._breakpoint._isRemoved || !this._breakpoint.enabled() || this._scriptDiverged())
             newState = null;
         else if (debuggerLocation) {
             var script = debuggerLocation.script();
             if (script.sourceURL)
                 newState = new WebInspector.BreakpointManager.Breakpoint.State(script.sourceURL, null, debuggerLocation.lineNumber, debuggerLocation.columnNumber, condition);
             else
                 newState = new WebInspector.BreakpointManager.Breakpoint.State(null, debuggerLocation.scriptId, debuggerLocation.lineNumber, debuggerLocation.columnNumber, condition)
         } else if (this._breakpoint._currentState && this._breakpoint._currentState.url) {
@@ skipping 82 matching lines @@
         this._uiLocations[location.id()] = uiLocation;
         this._breakpoint._replaceUILocation(oldUILocation, uiLocation);
     },
 
     /**
      * @param {!WebInspector.DebuggerModel.Location} location
      * @return {boolean}
      */
     _addResolvedLocation: function(location)
     {
-        var uiLocation = WebInspector.debuggerWorkspaceBinding.rawLocationToUILocation(location);
+        var uiLocation = this._debuggerWorkspaceBinding.rawLocationToUILocation(location);
         var breakpoint = this._breakpoint._breakpointManager.findBreakpoint(uiLocation.uiSourceCode, uiLocation.lineNumber, uiLocation.columnNumber);
         if (breakpoint && breakpoint !== this._breakpoint) {
             // location clash
             this._breakpoint.remove();
             return false;
         }
-        this._liveLocations.push(WebInspector.debuggerWorkspaceBinding.createLiveLocation(location, this._locationUpdated.bind(this, location)));
+        this._liveLocations.push(this._debuggerWorkspaceBinding.createLiveLocation(location, this._locationUpdated.bind(this, location)));
         return true;
     },
 
     _cleanUpAfterDebuggerIsGone: function()
     {
         this._resetLocations();
         if (this._debuggerId)
             this._didRemoveFromDebugger(function() {});
     },
 
@@ skipping 124 matching lines @@
 {
     this.sourceFileId = breakpoint._sourceFileId;
     this.lineNumber = breakpoint.lineNumber();
     this.columnNumber = breakpoint.columnNumber();
     this.condition = breakpoint.condition();
     this.enabled = breakpoint.enabled();
 }
 
 /** @type {!WebInspector.BreakpointManager} */
 WebInspector.breakpointManager;