[DevTools] Refactor connection-related classes.

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

 // Copyright 2016 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 {WebInspector.SDKModel}
  * @param {!WebInspector.Target} target
  */
 WebInspector.SubTargetsManager = function(target)
@@ skipping 49 matching lines @@
         var promise = new Promise(f => fulfill = f);
         this._agent.setAutoAttach(true /* autoAttach */, true /* waitForDebuggerOnStart */, fulfill);
         return promise;
     },
 
     /**
      * @override
      */
     dispose: function()
     {
-        for (var connection of this._connections.values())
-            connection.close();
+        for (var connection of this._connections.values()) {
+            this._agent.detachFromTarget(connection._targetId);
+            connection._onDisconnect.call(null, "disposed");
+        }
         this._connections.clear();
         this._attachedTargets.clear();
     },
 
     /**
      * @param {!TargetAgent.TargetID} targetId
      */
     activateTarget: function(targetId)
     {
         this._agent.activateTarget(targetId);
@@ skipping 60 matching lines @@
             return WebInspector.Target.Capability.JS;
         return 0;
     },
 
     /**
      * @param {!WebInspector.TargetInfo} targetInfo
      * @param {boolean} waitingForDebugger
      */
     _attachedToTarget: function(targetInfo, waitingForDebugger)
     {
-        var connection = new WebInspector.SubTargetConnection(this._agent, targetInfo.id);
-        this._connections.set(targetInfo.id, connection);
-
         var targetName = "";
         if (targetInfo.type === "node") {
             targetName = targetInfo.title;
         } else if (targetInfo.type !== "iframe") {
             var parsedURL = targetInfo.url.asParsedURL();
             targetName = parsedURL ? parsedURL.lastPathComponentWithFragment() : "#" + (++this._lastAnonymousTargetId);
         }
-        var target = WebInspector.targetManager.createTarget(targetName, this._capabilitiesForType(targetInfo.type), connection, this.target());
+        var target = WebInspector.targetManager.createTarget(targetName, this._capabilitiesForType(targetInfo.type), this._createConnection.bind(this, targetInfo.id), this.target());
         target[WebInspector.SubTargetsManager._InfoSymbol] = targetInfo;
         this._attachedTargets.set(targetInfo.id, target);
 
         // Only pause new worker if debugging SW - we are going through the pause on start checkbox.
         var mainIsServiceWorker = !this.target().parentTarget() && this.target().hasWorkerCapability() && !this.target().hasBrowserCapability();
         if (mainIsServiceWorker && waitingForDebugger)
             target.debuggerAgent().pause();
         target.runtimeAgent().runIfWaitingForDebugger();
 
         this.dispatchEventToListeners(WebInspector.SubTargetsManager.Events.SubTargetAdded, target);
     },
 
     /**
      * @param {string} targetId
+     * @param {!InspectorBackendClass.Connection.Params} params
+     * @return {!InspectorBackendClass.Connection}
+     */
+    _createConnection: function(targetId, params)
+    {
+        var connection = new WebInspector.SubTargetConnection(this._agent, targetId, params);
+        this._connections.set(targetId, connection);
+        return connection;
+    },
+
+    /**
+     * @param {string} targetId
      */
     _detachedFromTarget: function(targetId)
     {
-        var connection = this._connections.get(targetId);
-        if (connection)
-            connection._reportClosed();
-        this._connections.delete(targetId);
         var target = this._attachedTargets.get(targetId);
         this._attachedTargets.delete(targetId);
         this.dispatchEventToListeners(WebInspector.SubTargetsManager.Events.SubTargetRemoved, target);
+        var connection = this._connections.get(targetId);
+        if (connection)
+            connection._onDisconnect.call(null, "target terminated");
+        this._connections.delete(targetId);
     },
 
     /**
      * @param {string} targetId
      * @param {string} message
      */
     _receivedMessageFromTarget: function(targetId, message)
     {
         var connection = this._connections.get(targetId);
         if (connection)
-            connection.dispatch(message);
+            connection._onMessage.call(null, message);
     },
 
     /**
      * @param {!WebInspector.TargetInfo} targetInfo
      */
     _targetCreated: function(targetInfo)
     {
         if (targetInfo.type !== "node")
             return;
         this._agent.attachToTarget(targetInfo.id);
@@ skipping 64 matching lines @@
      * @param {string} message
      */
     receivedMessageFromTarget: function(targetId, message)
     {
         this._manager._receivedMessageFromTarget(targetId, message);
     }
 };
 
 /**
  * @constructor
- * @extends {InspectorBackendClass.Connection}
+ * @implements {InspectorBackendClass.Connection}
  * @param {!Protocol.TargetAgent} agent
  * @param {string} targetId
+ * @param {!InspectorBackendClass.Connection.Params} params
  */
-WebInspector.SubTargetConnection = function(agent, targetId)
+WebInspector.SubTargetConnection = function(agent, targetId, params)
 {
-    InspectorBackendClass.Connection.call(this);
     this._agent = agent;
     this._targetId = targetId;
+    this._onMessage = params.onMessage;
+    this._onDisconnect = params.onDisconnect;
 };
 
 WebInspector.SubTargetConnection.prototype = {
     /**
      * @override
-     * @param {!Object} messageObject
+     * @param {string} message
      */
-    sendMessage: function(messageObject)
+    sendMessage: function(message)
     {
-        this._agent.sendMessageToTarget(this._targetId, JSON.stringify(messageObject));
+        this._agent.sendMessageToTarget(this._targetId, message);
     },
 
     /**
      * @override
+     * @return {!Promise}
      */
-    forceClose: function()
+    disconnect: function()
     {
-        this._agent.detachFromTarget(this._targetId);
+        throw new Error("Not implemented");
     },
-
-    _reportClosed: function()
-    {
-        this.connectionClosed("target_terminated");
-    },
-
-    __proto__: InspectorBackendClass.Connection.prototype
 };
 
 /**
  * @constructor
  * @param {!TargetAgent.TargetInfo} payload
  */
 WebInspector.TargetInfo = function(payload)
 {
     this.id = payload.targetId;
     this.url = payload.url;
     this.type = payload.type;
     if (this.type !== "page" && this.type !== "iframe") {
         this.title = WebInspector.UIString("Worker: %s", this.url);
         this.canActivate = false;
     } else {
         this.title = payload.title;
         this.canActivate = true;
     }
 };