Devtools: Support disabling and enabling of debugger in TargetBreakpoints

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 419 matching lines @@
     this._numberOfDebuggerLocationForUILocation = {};
 
     // Force breakpoint update.
     /** @type {string} */ this._condition;
     /** @type {boolean} */ this._enabled;
     /** @type {boolean} */ this._isRemoved;
     /** @type {!WebInspector.UILocation|undefined} */ this._fakePrimaryLocation;
 
     /** @type {!Map.<!WebInspector.Target, !WebInspector.BreakpointManager.TargetBreakpoint>}*/
     this._targetBreakpoints = new Map();
+    this._updateState(condition, enabled);
     this._breakpointManager._targetManager.observeTargets(this);
-    this._updateState(condition, enabled);
 }
 
 WebInspector.BreakpointManager.Breakpoint.prototype = {
     /**
      * @param {!WebInspector.Target} target
      */
     targetAdded: function(target)
     {
         this._targetBreakpoints.put(target, new WebInspector.BreakpointManager.TargetBreakpoint(target, this));
     },
 
     /**
      * @param {!WebInspector.Target} target
      */
     targetRemoved: function(target)
     {
-        this._targetBreakpoints.remove(target)._resetLocations();
+        this._targetBreakpoints.remove(target)._dispose(true);
     },
 
     /**
      * @return {string}
      */
     projectId: function()
     {
         return this._projectId;
     },
 
@@ skipping 119 matching lines @@
     /**
      * @param {boolean=} keepInStorage
      */
     remove: function(keepInStorage)
     {
         this._isRemoved = true;
         var removeFromStorage = !keepInStorage;
         this._removeFakeBreakpointAtPrimaryLocation();
         var targetBreakpoints = this._targetBreakpoints.values();
         for (var i = 0; i < targetBreakpoints.length; ++i)
-            targetBreakpoints[i]._removeFromDebugger();
+            targetBreakpoints[i]._dispose();
 
         this._breakpointManager._removeBreakpoint(this, removeFromStorage);
         this._breakpointManager._targetManager.unobserveTargets(this);
     },
 
     _updateInDebugger: function()
     {
         var targetBreakpoints = this._targetBreakpoints.values();
         for (var i = 0; i < targetBreakpoints.length; ++i)
             targetBreakpoints[i]._updateInDebugger();
@@ skipping 45 matching lines @@
  */
 WebInspector.BreakpointManager.TargetBreakpoint = function(target, breakpoint)
 {
     WebInspector.TargetAware.call(this, target);
     this._breakpoint = breakpoint;
     /** @type {!Array.<!WebInspector.Script.Location>} */
     this._liveLocations = [];
 
     /** @type {!Object.<string, !WebInspector.UILocation>} */
     this._uiLocations = {};
+    target.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerWasDisabled, this._removeLocally, this);
+    target.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerWasEnabled, this._updateInDebugger, this);
+    if (target.debuggerModel.debuggerEnabled())
+        this._updateInDebugger();
 }
 
 WebInspector.BreakpointManager.TargetBreakpoint.prototype = {
 
     _resetLocations: function()
     {
         var uiLocations = Object.values(this._uiLocations);
         for (var i = 0; i < uiLocations.length; ++i)
             this._breakpoint._removeUILocation(uiLocations[i]);
 
@@ skipping 96 matching lines @@
         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(location.createLiveLocation(this._locationUpdated.bind(this, location)));
         return true;
     },
 
+    _removeLocally: function()

[vsevik, 2014/06/10 09:16:22]

cleanUpAfterDebuggerIsGone

[sergeyv, 2014/06/10 11:14:37]

Done.

+    {
+        this._resetLocations();
+        if (this._debuggerId)
+            this._didRemoveFromDebugger();
+    },
+
+    /**
+     * @param {boolean=} locally
+     */
+    _dispose: function(locally)
+    {
+        if (locally)

[vsevik, 2014/06/10 09:16:22]

Let's call these separately.

[sergeyv, 2014/06/10 11:14:37]

Done.

+            this._removeLocally();
+        else
+            this._removeFromDebugger();
+        this.target().debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerWasDisabled, this._removeLocally, this);

[vsevik, 2014/06/10 09:16:22]

removeEve..

[sergeyv, 2014/06/10 11:14:37]

Done.

+        this.target().debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.DebuggerWasEnabled, this._updateInDebugger, this);
+    },
+
     __proto__: WebInspector.TargetAware.prototype
 }
 
 /**
  * @constructor
  * @param {!WebInspector.BreakpointManager} breakpointManager
  * @param {!WebInspector.Setting} setting
  */
 WebInspector.BreakpointManager.Storage = function(breakpointManager, setting)
 {
@@ skipping 75 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;