DevTools: get rid of WebInspector.cssModel, use target models instead

Source/devtools/front_end/main/Main.js

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com).
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 198 matching lines @@
         {
             WebInspector.setToolbarColors(/** @type {string} */ (event.data["backgroundColor"]), /** @type {string} */ (event.data["color"]));
         }
 
         var canDock = !!WebInspector.queryParam("can_dock");
         WebInspector.zoomManager = new WebInspector.ZoomManager();
         WebInspector.inspectorView = new WebInspector.InspectorView();
         WebInspector.ContextMenu.initialize();
         WebInspector.dockController = new WebInspector.DockController(canDock);
         WebInspector.overridesSupport = new WebInspector.OverridesSupport(canDock);
+        WebInspector.multitargetConsoleModel = new WebInspector.MultitargetConsoleModel();
 
         WebInspector.shortcutsScreen = new WebInspector.ShortcutsScreen();
         // set order of some sections explicitly
         WebInspector.shortcutsScreen.section(WebInspector.UIString("Console"));
         WebInspector.shortcutsScreen.section(WebInspector.UIString("Elements Panel"));
 
         if (canDock)
             WebInspector.app = new WebInspector.AdvancedApp();
         else if (WebInspector.queryParam("remoteFrontend"))
             WebInspector.app = new WebInspector.ScreencastApp();
@@ skipping 60 matching lines @@
             WebInspector.setToolbarColors(WebInspector.queryParam("toolbarColor"), WebInspector.queryParam("textColor"));
         InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.SetToolbarColors, updateToolbarColors);
         /**
          * @param {!WebInspector.Event} event
          */
         function updateToolbarColors(event)
         {
             WebInspector.setToolbarColors(/** @type {string} */ (event.data["backgroundColor"]), /** @type {string} */ (event.data["color"]));
         }
         WebInspector.ContextMenu.initialize();
-
         WebInspector.targetManager.createTarget(WebInspector.UIString("Main"), connection, this._mainTargetCreated.bind(this));
         WebInspector.isolatedFileSystemManager = new WebInspector.IsolatedFileSystemManager();
         WebInspector.workspace = new WebInspector.Workspace(WebInspector.isolatedFileSystemManager.mapping());
         WebInspector.networkWorkspaceBinding = new WebInspector.NetworkWorkspaceBinding(WebInspector.workspace);
         new WebInspector.NetworkUISourceCodeProvider(WebInspector.networkWorkspaceBinding, WebInspector.workspace);
         new WebInspector.PresentationConsoleMessageHelper(WebInspector.workspace);
         WebInspector.fileSystemWorkspaceBinding = new WebInspector.FileSystemWorkspaceBinding(WebInspector.isolatedFileSystemManager, WebInspector.workspace);
         WebInspector.breakpointManager = new WebInspector.BreakpointManager(WebInspector.settings.breakpoints, WebInspector.workspace, WebInspector.targetManager);
         WebInspector.scriptSnippetModel = new WebInspector.ScriptSnippetModel(WebInspector.workspace);
         this._executionContextSelector = new WebInspector.ExecutionContextSelector();
@@ skipping 51 matching lines @@
         new WebInspector.RenderingOptions();
         new WebInspector.Main.PauseListener();
         new WebInspector.Main.WarningErrorCounter();
         new WebInspector.Main.InspectedNodeRevealer();
 
         this._addMainEventListeners(document);
 
         var errorWarningCount = document.getElementById("error-warning-count");
         function showConsole()
         {
-            WebInspector.consoleModel.show();
+            WebInspector.console.show();
         }
         errorWarningCount.addEventListener("click", showConsole, false);
 
         WebInspector.extensionServerProxy.setFrontendReady();
 
         InspectorAgent.enable(inspectorAgentEnableCallback);
 
         function inspectorAgentEnableCallback()
         {
             console.timeStamp("Main.inspectorAgentEnableCallback");
@@ skipping 25 matching lines @@
     {
         WebInspector.console.addEventListener(WebInspector.Console.Events.MessageAdded, messageAdded);
 
         /**
          * @param {!WebInspector.Event} event
          */
         function messageAdded(event)
         {
             var message = /** @type {!WebInspector.Console.Message} */ (event.data);
             if (message.show)
-                WebInspector.consoleModel.show();
+                WebInspector.console.show();
         }
     },
 
     _documentClick: function(event)
     {
         var anchor = event.target.enclosingNodeOrSelfWithNodeName("a");
         if (!anchor || !anchor.href)
             return;
 
         // Prevent the link from navigating, since we don't do any navigation by following links normally.
@@ skipping 400 matching lines @@
  * @param {string} name
  * @return {?WebInspector.Panel}
  */
 WebInspector.panel = function(name)
 {
     return WebInspector.inspectorView.panel(name);
 }
 
 /**
  * @constructor
- * @implements {WebInspector.TargetManager.Observer}
  */
 WebInspector.Main.WarningErrorCounter = function()
 {
-    WebInspector.targetManager.observeTargets(this);
+    WebInspector.multitargetConsoleModel.addEventListener(WebInspector.ConsoleModel.Events.ConsoleCleared, this._updateErrorAndWarningCounts, this);
+    WebInspector.multitargetConsoleModel.addEventListener(WebInspector.ConsoleModel.Events.MessageAdded, this._updateErrorAndWarningCounts, this);
 }
 
 WebInspector.Main.WarningErrorCounter.prototype = {
-    /**
-     * @param {!WebInspector.Target} target
-     */
-    targetAdded: function(target)
-    {
-        target.consoleModel.addEventListener(WebInspector.ConsoleModel.Events.ConsoleCleared, this._updateErrorAndWarningCounts, this);
-        target.consoleModel.addEventListener(WebInspector.ConsoleModel.Events.MessageAdded, this._updateErrorAndWarningCounts, this);
-        this._updateErrorAndWarningCounts();
-    },
-
-    /**
-     * @param {!WebInspector.Target} target
-     */
-    targetRemoved: function(target)
-    {
-        target.consoleModel.removeEventListener(WebInspector.ConsoleModel.Events.ConsoleCleared, this._updateErrorAndWarningCounts, this);
-        target.consoleModel.removeEventListener(WebInspector.ConsoleModel.Events.MessageAdded, this._updateErrorAndWarningCounts, this);
-    },
-
     _updateErrorAndWarningCounts: function()
     {
         var errors = 0;
         var warnings = 0;
         var targets = WebInspector.targetManager.targets();
         for (var i = 0; i < targets.length; ++i) {
             errors = errors + targets[i].consoleModel.errors;
             warnings = warnings + targets[i].consoleModel.warnings;
         }
         WebInspector.inspectorView.setErrorAndWarningCounts(errors, warnings);
@@ skipping 69 matching lines @@
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _inspectNode: function(event)
     {
         WebInspector.Revealer.reveal(/** @type {!WebInspector.DOMNode} */ (event.data));
     }
 }