[DevTools] Refactor connection-related classes.

third_party/WebKit/Source/devtools/front_end/sdk/WorkerManager.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 20 matching lines @@
 /**
  * @constructor
  * @extends {WebInspector.SDKObject}
  * @param {!WebInspector.Target} target
  */
 WebInspector.WorkerManager = function(target)
 {
     WebInspector.SDKObject.call(this, target);
     target.registerWorkerDispatcher(new WebInspector.WorkerDispatcher(this));
     this._lastAnonymousTargetId = 0;
-    /** @type {!Map.<string, !WebInspector.WorkerConnection>} */
-    this._connections = new Map();
+    /** @type {!Map.<string, !WebInspector.WorkerChannel>} */
+    this._channels = new Map();
 
     /** @type {!Map.<string, !WebInspector.Target>} */
     this._targetsByWorkerId = new Map();
 
     WebInspector.targetManager.addEventListener(WebInspector.TargetManager.Events.SuspendStateChanged, this._onSuspendStateChanged, this);
     this._onSuspendStateChanged();
     this.enable();
 }
 
 WebInspector.WorkerManager.prototype = {
@@ skipping 17 matching lines @@
         WebInspector.targetManager.removeEventListener(WebInspector.TargetManager.Events.MainFrameNavigated, this._mainFrameNavigated, this);
     },
 
     dispose: function()
     {
         this._reset();
     },
 
     _reset: function()
     {
-        for (var connection of this._connections.values())
-            connection.close();
-        this._connections.clear();
+        for (var channel of this._channels.values())
+            channel.dispatchEventToListeners(InspectorBackendClass.Channel.Events.ChannelClosed, "worker terminated");
+        this._channels.clear();
         this._targetsByWorkerId.clear();
     },
 
     _onSuspendStateChanged: function()
     {
         var suspended = WebInspector.targetManager.allTargetsSuspended();
         this.target().workerAgent().setWaitForDebuggerOnStart(!suspended);
     },
 
     /**
      * @param {string} workerId
      * @param {string} url
      * @param {boolean} waitingForDebugger
      */
     _workerCreated: function(workerId, url, waitingForDebugger)
     {
-        var connection = new WebInspector.WorkerConnection(this, workerId);
-        this._connections.set(workerId, connection);
+        var channel = new WebInspector.WorkerChannel(this, workerId);
+        this._channels.set(workerId, channel);
 
         var parsedURL = url.asParsedURL();
         var workerName = parsedURL ? parsedURL.lastPathComponentWithFragment() : "#" + (++this._lastAnonymousTargetId);
-        var target = WebInspector.targetManager.createTarget(workerName, WebInspector.Target.Capability.JS | WebInspector.Target.Capability.Log, connection, this.target());
+        var target = WebInspector.targetManager.createTarget(workerName, WebInspector.Target.Capability.JS | WebInspector.Target.Capability.Log, channel, this.target());
         this._targetsByWorkerId.set(workerId, target);
 
         // Only pause new worker if debugging SW - we are going through the
         // pause on start checkbox.
         var mainIsServiceWorker = WebInspector.targetManager.mainTarget().hasWorkerCapability() && !WebInspector.targetManager.mainTarget().hasBrowserCapability();
         if (mainIsServiceWorker && waitingForDebugger)
             target.debuggerAgent().pause();
         target.runtimeAgent().runIfWaitingForDebugger();
     },
 
     /**
      * @param {string} workerId
      */
     _workerTerminated: function(workerId)
     {
-        var connection = this._connections.get(workerId);
-        if (connection)
-            connection._reportClosed();
-        this._connections.delete(workerId);
+        var channel = this._channels.get(workerId);
+        if (channel)
+            channel.dispatchEventToListeners(InspectorBackendClass.Channel.Events.ChannelClosed, "worker terminated");
+        this._channels.delete(workerId);
         this._targetsByWorkerId.delete(workerId);
     },
 
     /**
      * @param {string} workerId
      * @param {string} message
      */
     _dispatchMessageFromWorker: function(workerId, message)
     {
-        var connection = this._connections.get(workerId);
-        if (connection)
-            connection.dispatch(message);
+        var channel = this._channels.get(workerId);
+        if (channel)
+            channel.dispatchEventToListeners(InspectorBackendClass.Channel.Events.MessageReceived, message);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _mainFrameNavigated: function(event)
     {
         if (event.data.target() !== this.target())
             return;
         this._reset(); // TODO (dgozman): Probably, unnecessary. Consider removal.
@@ skipping 47 matching lines @@
      * @param {string} message
      */
     dispatchMessageFromWorker: function(workerId, message)
     {
         this._workerManager._dispatchMessageFromWorker(workerId, message);
     }
 }
 
 /**
  * @constructor
- * @extends {InspectorBackendClass.Connection}
+ * @extends {WebInspector.Object}
+ * @implements {InspectorBackendClass.Channel}
  * @param {!WebInspector.WorkerManager} workerManager
  * @param {string} workerId
  */
-WebInspector.WorkerConnection = function(workerManager, workerId)
+WebInspector.WorkerChannel = function(workerManager, workerId)
 {
-    InspectorBackendClass.Connection.call(this);
-    // FIXME: remove resourceTreeModel and others from worker targets
-    this.suppressErrorsForDomains(["Worker", "Page", "CSS", "DOM", "DOMStorage", "Database", "Network", "IndexedDB"]);
+    WebInspector.Object.call(this);
     this._agent = workerManager.target().workerAgent();
     this._workerId = workerId;
 }
 
-WebInspector.WorkerConnection.prototype = {
+WebInspector.WorkerChannel.prototype = {
     /**
      * @override
-     * @param {!Object} messageObject
+     * @param {string} message
      */
-    sendMessage: function(messageObject)
+    sendMessage: function(message)
     {
-        this._agent.sendMessageToWorker(this._workerId, JSON.stringify(messageObject));
+        this._agent.sendMessageToWorker(this._workerId, message);
     },
 
-    _reportClosed: function()
+    /**
+     * @override
+     * @param {function()} callback
+     */
+    reconnect: function(callback)
     {
-        this.connectionClosed("worker_terminated");
+        throw new Error("Not implemented");
     },
 
-    __proto__: InspectorBackendClass.Connection.prototype
+    __proto__: WebInspector.Object.prototype
 }