DevTools: Introduce Target class which holds connection & models

Source/devtools/front_end/inspector.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 275 matching lines @@
         }
         WebInspector.socket.onclose = function() {
             if (!WebInspector.socket._detachReason)
                 (new WebInspector.RemoteDebuggingTerminatedScreen("websocket_closed")).showModal();
         }
         return;
     }
 
     WebInspector.doLoadedDone();
 
-    // In case of loading as a web page with no bindings / harness, kick off initialization manually.
-    if (InspectorFrontendHost.isStub) {
+    if (InspectorFrontendHost.isStub)
         InspectorFrontendAPI.dispatchQueryParameters(WebInspector.queryParamsObject);
-        WebInspector._doLoadedDoneWithCapabilities();
-    }
 }
 
 WebInspector.doLoadedDone = function()
 {
     // Install styles and themes
     WebInspector.installPortStyles();
     if (WebInspector.socket)
         document.body.classList.add("remote");
 
     if (WebInspector.queryParamsObject.toolbarColor && WebInspector.queryParamsObject.textColor)
         WebInspector.setToolbarColors(WebInspector.queryParamsObject.toolbarColor, WebInspector.queryParamsObject.textColor);
 
     var workerId = WebInspector.queryParamsObject["dedicatedWorkerId"];
     if (workerId)
         this._initializeDedicatedWorkerFrontend(workerId);
 
     var connection = workerId ? new WebInspector.WorkerConnection(workerId) : new InspectorBackendClass.MainConnection();
     InspectorBackend.setConnection(connection);
 
-    PageAgent.canScreencast(WebInspector._initializeCapability.bind(WebInspector, "canScreencast", null));
-    WorkerAgent.canInspectWorkers(WebInspector._initializeCapability.bind(WebInspector, "canInspectWorkers", WebInspector._doLoadedDoneWithCapabilities.bind(WebInspector)));
+    WebInspector.targetManager = new WebInspector.TargetManager();
+    var mainTarget = WebInspector.targetManager.newConnectionAvailable(connection);
+    mainTarget.addEventListener(WebInspector.Target.Events.TargetIsReady, WebInspector._doLoadedDoneWithCapabilities.bind(WebInspector, mainTarget));
 }
 
-WebInspector._doLoadedDoneWithCapabilities = function()
+WebInspector._doLoadedDoneWithCapabilities = function(mainTarget)
 {
+    // compatibility code
+    Capabilities.canInspectWorkers = mainTarget.canInspectWorkers;
+    this.console = mainTarget.consoleModel;
+    this.networkManager = mainTarget.networkManager;
+    this.resourceTreeModel = mainTarget.resourceTreeModel;
+    this.debuggerModel = mainTarget.debuggerModel;
+    this.runtimeModel = mainTarget.runtimeModel;
+
+    this.domAgent = new WebInspector.DOMAgent();
+    this.workerManager = new WebInspector.WorkerManager(this.canInspectWorkers);
+
     new WebInspector.VersionController().updateVersion();
-
     WebInspector.shortcutsScreen = new WebInspector.ShortcutsScreen();
     this._registerShortcuts();
 
     // set order of some sections explicitly
     WebInspector.shortcutsScreen.section(WebInspector.UIString("Console"));
     WebInspector.shortcutsScreen.section(WebInspector.UIString("Elements Panel"));
     WebInspector.ShortcutsScreen.registerShortcuts();
 
-    this.console = new WebInspector.ConsoleModel();
     this.console.addEventListener(WebInspector.ConsoleModel.Events.ConsoleCleared, this._resetErrorAndWarningCounts, this);
     this.console.addEventListener(WebInspector.ConsoleModel.Events.MessageAdded, this._updateErrorAndWarningCounts, this);
     this.console.addEventListener(WebInspector.ConsoleModel.Events.RepeatCountUpdated, this._updateErrorAndWarningCounts, this);
-    this.networkManager = new WebInspector.NetworkManager();
-    this.resourceTreeModel = new WebInspector.ResourceTreeModel(this.networkManager, this.console);
-    this.debuggerModel = new WebInspector.DebuggerModel();
+
     this.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerPaused, this._debuggerPaused, this);
     this.networkLog = new WebInspector.NetworkLog();
-    this.domAgent = new WebInspector.DOMAgent();
     this.domAgent.addEventListener(WebInspector.DOMAgent.Events.InspectNodeRequested, this._inspectNodeRequested, this);

[aandrey, 2014/03/04 10:05:16]

domAgent is one for many targets? what is "target" then?

[sergeyv, 2014/03/04 12:42:38]

It is hard to add support of multiple target in all codebase in one patch, so it
is added step by step. Currently domAgent is one for all targets, but it will be
changed in next patches.

-    this.workerManager = new WebInspector.WorkerManager(Capabilities.canInspectWorkers);
-    this.runtimeModel = new WebInspector.RuntimeModel(this.resourceTreeModel);
 
     this.zoomManager = new WebInspector.ZoomManager();
 
     this.advancedSearchController = new WebInspector.AdvancedSearchController();
     this.consoleView = new WebInspector.ConsoleView(WebInspector.isWorkerFrontend());
 
     InspectorBackend.registerInspectorDispatcher(this);
 
     this.isolatedFileSystemManager = new WebInspector.IsolatedFileSystemManager();
     this.isolatedFileSystemDispatcher = new WebInspector.IsolatedFileSystemDispatcher(this.isolatedFileSystemManager);
@@ skipping 38 matching lines @@
     new WebInspector.PresentationConsoleMessageHelper(this.workspace);
 
     // Create settings before loading modules.
     WebInspector.settings.initializeBackendSettings();
 
     this._registerModules();
 
     this.panels = {};
     this.inspectorView = new WebInspector.InspectorView();
     // Screencast controller creates a root view itself.
-    if (Capabilities.canScreencast)
+    if (mainTarget.canScreencast)
         this._screencastController = new WebInspector.ScreencastController();
     else
         this._createRootView();
     this._createGlobalStatusBarItems();
 
     this.addMainEventListeners(document);
 
     window.addEventListener("resize", this.windowResize.bind(this), true);
 
     var errorWarningCount = document.getElementById("error-warning-count");
@@ skipping 469 matching lines @@
 WebInspector.addMainEventListeners = function(doc)
 {
     doc.addEventListener("keydown", this.postDocumentKeyDown.bind(this), false);
     doc.addEventListener("beforecopy", this.documentCanCopy.bind(this), true);
     doc.addEventListener("copy", this.documentCopy.bind(this), false);
     doc.addEventListener("contextmenu", this.contextMenuEventFired.bind(this), true);
     doc.addEventListener("click", this.documentClick.bind(this), false);
 }
 
 window.DEBUG = true;