DevTools: introduce multitarget model listeners

Source/devtools/front_end/extensions/ExtensionServer.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 648 matching lines @@
     },
 
     _dispatchCallback: function(requestId, port, result)
     {
         if (requestId)
             port.postMessage({ command: "callback", requestId: requestId, result: result });
     },
 
     _initExtensions: function()
     {
-        this._registerAutosubscriptionHandler(WebInspector.extensionAPI.Events.ConsoleMessageAdded,
-            WebInspector.multitargetConsoleModel, WebInspector.ConsoleModel.Events.MessageAdded, this._notifyConsoleMessageAdded);
-        this._registerAutosubscriptionHandler(WebInspector.extensionAPI.Events.NetworkRequestFinished,
-            WebInspector.networkManager, WebInspector.NetworkManager.EventTypes.RequestFinished, this._notifyRequestFinished);
+        this._registerAutosubscriptionTargetManagerHandler(WebInspector.extensionAPI.Events.ConsoleMessageAdded,
+            WebInspector.ConsoleModel, WebInspector.ConsoleModel.Events.MessageAdded, this._notifyConsoleMessageAdded);
         this._registerAutosubscriptionHandler(WebInspector.extensionAPI.Events.ResourceAdded,
-            WebInspector.workspace,
-            WebInspector.Workspace.Events.UISourceCodeAdded,
-            this._notifyResourceAdded);
+            WebInspector.workspace, WebInspector.Workspace.Events.UISourceCodeAdded, this._notifyResourceAdded);
+        this._registerAutosubscriptionTargetManagerHandler(WebInspector.extensionAPI.Events.NetworkRequestFinished,
+            WebInspector.NetworkManager, WebInspector.NetworkManager.EventTypes.RequestFinished, this._notifyRequestFinished);
 
         /**
          * @this {WebInspector.ExtensionServer}
          */
         function onElementsSubscriptionStarted()
         {
             WebInspector.notifications.addEventListener(WebInspector.NotificationService.Events.SelectedNodeChanged, this._notifyElementsSelectionChanged, this);
         }
 
         /**
@@ skipping 177 matching lines @@
         console.assert(command);
         this._handlers[command] = callback;
     },
 
     _registerSubscriptionHandler: function(eventTopic, onSubscribeFirst, onUnsubscribeLast)
     {
         this._subscriptionStartHandlers[eventTopic] = onSubscribeFirst;
         this._subscriptionStopHandlers[eventTopic] = onUnsubscribeLast;
     },
 
+    /**
+     * @param {string} eventTopic
+     * @param {!Object} eventTarget
+     * @param {string} frontendEventType
+     * @param {function(!WebInspector.Event)} handler
+     */
     _registerAutosubscriptionHandler: function(eventTopic, eventTarget, frontendEventType, handler)
     {
         this._registerSubscriptionHandler(eventTopic,
             eventTarget.addEventListener.bind(eventTarget, frontendEventType, handler, this),
             eventTarget.removeEventListener.bind(eventTarget, frontendEventType, handler, this));
     },
 
+    /**
+     * @param {string} eventTopic
+     * @param {!Function} modelClass
+     * @param {string} frontendEventType
+     * @param {function(!WebInspector.Event)} handler
+     */
+    _registerAutosubscriptionTargetManagerHandler: function(eventTopic, modelClass, frontendEventType, handler)
+    {
+        this._registerSubscriptionHandler(eventTopic,
+            WebInspector.targetManager.addModelListener.bind(WebInspector.targetManager, modelClass, frontendEventType, handler, this),
+            WebInspector.targetManager.removeModelListener.bind(WebInspector.targetManager, modelClass, frontendEventType, handler, this));
+    },
+
     _registerResourceContentCommittedHandler: function(handler)
     {
         /**
          * @this {WebInspector.ExtensionServer}
          */
         function addFirstEventListener()
         {
             WebInspector.workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeContentCommitted, handler, this);
             WebInspector.workspace.setHasResourceContentTrackingExtensions(true);
         }
@@ skipping 187 matching lines @@
 /**
  * @typedef {{code: string, description: string, details: !Array.<*>}}
  */
 WebInspector.ExtensionStatus.Record;
 
 WebInspector.extensionAPI = {};
 defineCommonExtensionSymbols(WebInspector.extensionAPI);
 
 importScript("ExtensionPanel.js");
 importScript("ExtensionView.js");