DevTools: introduce multitarget model listeners

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 {string} name
  * @param {!InspectorBackendClass.Connection} connection
  * @param {function(!WebInspector.Target)=} callback
  */
 WebInspector.Target = function(name, connection, callback)
 {
     Protocol.Agents.call(this, connection.agentsMap());
     /** @type {!WeakReference.<!WebInspector.Target>} */
     this._weakReference = new WeakReference(this);
     this._name = name;
     this._connection = connection;
     connection.addEventListener(InspectorBackendClass.Connection.Events.Disconnected, this._onDisconnect, this);
     this._id = WebInspector.Target._nextId++;
 
+    /** @type {!Map.<!Function, !WebInspector.SDKModel>} */
+    this._modelByConstructor = new Map();
+
     /** @type {!Object.<string, boolean>} */
     this._capabilities = {};
     this.pageAgent().canScreencast(this._initializeCapability.bind(this, WebInspector.Target.Capabilities.canScreencast, null));
     this.pageAgent().hasTouchInputs(this._initializeCapability.bind(this, WebInspector.Target.Capabilities.hasTouchInputs, null));
     if (WebInspector.experimentsSettings.timelinePowerProfiler.isEnabled())
         this.powerAgent().canProfilePower(this._initializeCapability.bind(this, WebInspector.Target.Capabilities.canProfilePower, null));
     this.workerAgent().canInspectWorkers(this._initializeCapability.bind(this, WebInspector.Target.Capabilities.canInspectWorkers, this._loadedWithCapabilities.bind(this, callback)));
 
     /** @type {!WebInspector.Lock} */
     this.profilingLock = new WebInspector.Lock();
@@ skipping 63 matching lines @@
     /**
      * @param {function(!WebInspector.Target)=} callback
      */
     _loadedWithCapabilities: function(callback)
     {
         /** @type {!WebInspector.ConsoleModel} */
         this.consoleModel = new WebInspector.ConsoleModel(this);
 
         /** @type {!WebInspector.NetworkManager} */
         this.networkManager = new WebInspector.NetworkManager(this);
-        if (!WebInspector.networkManager)
-            WebInspector.networkManager = this.networkManager;
 
         /** @type {!WebInspector.ResourceTreeModel} */
         this.resourceTreeModel = new WebInspector.ResourceTreeModel(this);
         if (!WebInspector.resourceTreeModel)
             WebInspector.resourceTreeModel = this.resourceTreeModel;
 
         /** @type {!WebInspector.NetworkLog} */
         this.networkLog = new WebInspector.NetworkLog(this);
         if (!WebInspector.networkLog)
             WebInspector.networkLog = this.networkLog;
@@ skipping 113 matching lines @@
     target: function()
     {
         return this._target;
     },
 
     __proto__: WebInspector.Object.prototype
 }
 
 /**
  * @constructor
+ * @extends {WebInspector.SDKObject}
+ * @param {!Function} modelClass
+ * @param {!WebInspector.Target} target
+ */
+WebInspector.SDKModel = function(modelClass, target)
+{
+    WebInspector.SDKObject.call(this, target);
+    target._modelByConstructor.put(modelClass, this);
+}
+
+WebInspector.SDKModel.prototype = {
+

[apavlov, 2014/07/17 22:09:59]

extra line

[pfeldman, 2014/07/18 11:59:47]

Done.

+    __proto__: WebInspector.SDKObject.prototype
+}
+
+/**
+ * @constructor
  */
 WebInspector.TargetManager = function()
 {
     /** @type {!Array.<!WebInspector.Target>} */
     this._targets = [];
     /** @type {!Array.<!WebInspector.TargetManager.Observer>} */
     this._observers = [];
+    /** @type {!Object.<string, !Array.<{modelClass: !Function, thisObject: (!Object|undefined), listener: function(!WebInspector.Event)}>>} */
+    this._listeners = {};
 }
 
 WebInspector.TargetManager.prototype = {
+    /**
+     * @param {!Function} modelClass
+     * @param {string} eventType
+     * @param {function(!WebInspector.Event)} listener
+     * @param {!Object=} thisObject
+     */
+    addModelListener: function(modelClass, eventType, listener, thisObject)
+    {
+        for (var i = 0; i < this._targets.length; ++i) {
+            var target = this._targets[i];

[apavlov, 2014/07/17 22:09:58]

can be inlined

[pfeldman, 2014/07/18 11:59:47]

Done.

+            var model = target._modelByConstructor.get(modelClass);
+            model.addEventListener(eventType, listener, thisObject);
+        }
+        if (!this._listeners[eventType])
+            this._listeners[eventType] = [];
+        this._listeners[eventType].push({ modelClass: modelClass, thisObject: thisObject, listener: listener });
+    },
+
+    /**
+     * @param {!Function} modelClass
+     * @param {string} eventType
+     * @param {function(!WebInspector.Event)} listener
+     * @param {!Object=} thisObject
+     */
+    removeModelListener: function(modelClass, eventType, listener, thisObject)
+    {
+        if (!this._listeners[eventType])
+            return;
+
+        for (var i = 0; i < this._targets.length; ++i) {
+            var target = this._targets[i];

[apavlov, 2014/07/17 22:09:59]

ditto

[pfeldman, 2014/07/18 11:59:47]

Done.

+            var model = target._modelByConstructor.get(modelClass);
+            model.removeEventListener(eventType, listener, thisObject);
+        }
+
+        var listeners = this._listeners[eventType];
+        for (var i = 0; i < listeners.length; ++i) {
+            if (listeners[i].modelClass === modelClass && listeners[i].listener === listener && listeners[i].thisObject === thisObject)
+                listeners.splice(i--, 1);
+        }
+        if (!listeners.length)
+            delete this._listeners[eventType];
+    },
 
     /**
      * @param {!WebInspector.TargetManager.Observer} targetObserver
      */
     observeTargets: function(targetObserver)
     {
         this.targets().forEach(targetObserver.targetAdded.bind(targetObserver));
         this._observers.push(targetObserver);
     },
 
@@ skipping 20 matching lines @@
          */
         function callbackWrapper(newTarget)
         {
             this.addTarget(newTarget);
             if (callback)
                 callback(newTarget);
         }
     },
 
     /**
-     * @param {!WebInspector.Target} newTarget
+     * @param {!WebInspector.Target} target
      */
-    addTarget: function(newTarget)
+    addTarget: function(target)
     {
-        this._targets.push(newTarget);
+        this._targets.push(target);
         var copy = this._observers;

[apavlov, 2014/07/17 22:09:59]

while we are here, "copy" sounds a bit wrong - it's just a ref

[pfeldman, 2014/07/18 11:59:47]

Done.

-        for (var i = 0; i < copy.length; ++i)
-            copy[i].targetAdded(newTarget);
+        for (var i = 0; i < copy.length; ++i) {
+            copy[i].targetAdded(target);
+            for (var eventType in this._listeners) {

[apavlov, 2014/07/17 22:09:58]

Should this loop reside outside the outer one? It does not make use of |copy|

[pfeldman, 2014/07/18 11:59:47]

Done.

+                var listeners = this._listeners[eventType];
+                for (var i = 0; i < listeners.length; ++i) {

[apavlov, 2014/07/17 22:09:58]

nested iteration by "i". Argh.

[pfeldman, 2014/07/18 11:59:47]

Done.

+                    var model = target._modelByConstructor.get(listeners[i].modelClass);
+                    model.addEventListener(eventType, listeners[i].listener, listeners[i].thisObject);
+                }
+            }
+        }
     },
 
     /**
      * @param {!WebInspector.Target} target
      */
     removeTarget: function(target)
     {
         this._targets.remove(target);
         var copy = this._observers.slice();
-        for (var i = 0; i < copy.length; ++i)
+        for (var i = 0; i < copy.length; ++i) {
             copy[i].targetRemoved(target);
+            for (var eventType in this._listeners) {

[apavlov, 2014/07/17 22:09:59]

ditto

[pfeldman, 2014/07/18 11:59:47]

Done.

+                var listeners = this._listeners[eventType];
+                for (var i = 0; i < listeners.length; ++i) {

[apavlov, 2014/07/17 22:09:59]

ditto

[pfeldman, 2014/07/18 11:59:47]

Done.

+                    var model = target._modelByConstructor.get(listeners[i].modelClass);
+                    model.removeEventListener(eventType, listeners[i].listener, listeners[i].thisObject);
+                }
+            }
+        }
     },
 
     /**
      * @return {!Array.<!WebInspector.Target>}
      */
     targets: function()
     {
         return this._targets.slice();
     },
 
@@ skipping 22 matching lines @@
     /**
      * @param {!WebInspector.Target} target
      */
     targetRemoved: function(target) { },
 }
 
 /**
  * @type {!WebInspector.TargetManager}
  */
 WebInspector.targetManager = new WebInspector.TargetManager();