[DevTools] Refactor connection-related classes.

third_party/WebKit/Source/devtools/front_end/sdk/Target.js

 /*
  * Copyright 2014 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /**
  * @constructor
  * @extends {Protocol.Agents}
  * @param {!WebInspector.TargetManager} targetManager
  * @param {string} name
  * @param {number} capabilitiesMask
- * @param {!InspectorBackendClass.Connection} connection
+ * @param {!InspectorBackendClass.Channel} channel
  * @param {?WebInspector.Target} parentTarget
  */
-WebInspector.Target = function(targetManager, name, capabilitiesMask, connection, parentTarget)
+WebInspector.Target = function(targetManager, name, capabilitiesMask, channel, parentTarget)
 {
+    var connection = new InspectorBackendClass.Connection(channel, this._dispose.bind(this));
     Protocol.Agents.call(this, connection.agentsMap());
     this._targetManager = targetManager;
     this._name = name;
     this._inspectedURL = "";
     this._capabilitiesMask = capabilitiesMask;
     this._connection = connection;
     this._parentTarget = parentTarget;
-    connection.addEventListener(InspectorBackendClass.Connection.Events.Disconnected, this.dispose, this);
     this._id = WebInspector.Target._nextId++;
+    this._disposed = false;
 
     /** @type {!Map.<!Function, !WebInspector.SDKModel>} */
     this._modelByConstructor = new Map();
 }
 
 /**
  * @enum {number}
  */
 WebInspector.Target.Capability = {
     Browser: 1,
@@ skipping 48 matching lines @@
     /**
      * @param {number} capabilitiesMask
      * @return {boolean}
      */
     hasAllCapabilities: function(capabilitiesMask)
     {
         return (this._capabilitiesMask & capabilitiesMask) === capabilitiesMask;
     },
 
     /**
-     * @return {!InspectorBackendClass.Connection}
-     */
-    connection: function()
-    {
-        return this._connection;
-    },
-
-    /**
      * @param {string} label
      * @return {string}
      */
     decorateLabel: function(label)
     {
         return !this.hasBrowserCapability() ? "\u2699 " + label : label;
     },
 
     /**
      * @override
@@ skipping 54 matching lines @@
     },
 
     /**
      * @return {?WebInspector.Target}
      */
     parentTarget: function()
     {
         return this._parentTarget;
     },
 
-    dispose: function()
+    /**
+     * @param {string} reason
+     */
+    _dispose: function(reason)
     {
+        this._disposed = true;
         this._targetManager.removeTarget(this);
         for (var model of this._modelByConstructor.valuesArray())
             model.dispose();
         if (this.workerManager)
             this.workerManager.dispose();
     },
 
     /**
      * @return {boolean}
      */
-    isDetached: function()
+    isDisposed: function()
     {
-        return this._connection.isClosed();
+        return this._disposed;
     },
 
     /**
      * @param {!Function} modelClass
      * @return {?WebInspector.SDKModel}
      */
     model: function(modelClass)
     {
         return this._modelByConstructor.get(modelClass) || null;
     },
@@ skipping 92 matching lines @@
     _targetDisposed: function(event)
     {
         var target = /** @type {!WebInspector.Target} */ (event.data);
         if (target !== this._target)
             return;
         this.dispose();
     },
 
     __proto__: WebInspector.SDKObject.prototype
 }