[DevTools] Console should wait for the main target

third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js

 /*
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * 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
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 150 matching lines @@
     var historyData = this._consoleHistorySetting.get();
     this._prompt.history().setHistoryData(historyData);
     this._consoleHistoryAutocompleteChanged();
 
     this._updateFilterStatus();
     this._timestampsSetting.addChangeListener(this._consoleTimestampsSettingChanged, this);
 
     this._registerWithMessageSink();
     SDK.targetManager.observeTargets(this);
 
-    this._initConsoleMessages();
-
     UI.context.addFlavorChangeListener(SDK.ExecutionContext, this._executionContextChanged, this);
 
     this._messagesElement.addEventListener('mousedown', this._updateStickToBottomOnMouseDown.bind(this), false);
     this._messagesElement.addEventListener('mouseup', this._updateStickToBottomOnMouseUp.bind(this), false);
     this._messagesElement.addEventListener('mouseleave', this._updateStickToBottomOnMouseUp.bind(this), false);
     this._messagesElement.addEventListener('wheel', this._updateStickToBottomOnWheel.bind(this), false);
   }
 
   /**
    * @return {!Console.ConsoleView}
@@ skipping 20 matching lines @@
 
   _clearHistory() {
     this._consoleHistorySetting.set([]);
     this._prompt.history().setHistoryData([]);
   }
 
   _consoleHistoryAutocompleteChanged() {
     this._prompt.setAddCompletionsFromHistory(this._consoleHistoryAutocompleteSetting.get());
   }
 
-  _initConsoleMessages() {
-    var mainTarget = SDK.targetManager.mainTarget();
-    var resourceTreeModel = mainTarget && SDK.ResourceTreeModel.fromTarget(mainTarget);
-    var resourcesLoaded = !resourceTreeModel || resourceTreeModel.cachedResourcesLoaded();
-    if (!mainTarget || !resourcesLoaded) {
-      SDK.targetManager.addModelListener(
-          SDK.ResourceTreeModel, SDK.ResourceTreeModel.Events.CachedResourcesLoaded, this._onResourceTreeModelLoaded,
-          this);
+  /**
+   * @param {!SDK.Target} target
+   */
+  _initConsoleMessages(target) {
+    var resourceTreeModel = SDK.ResourceTreeModel.fromTarget(target);
+    if (resourceTreeModel && !resourceTreeModel.cachedResourcesLoaded()) {
+      resourceTreeModel.addEventListener(
+          SDK.ResourceTreeModel.Events.CachedResourcesLoaded, this._onResourceTreeModelLoaded, this);
       return;
     }
     this._fetchMultitargetMessages();
   }
 
   /**
    * @param {!Common.Event} event
    */
   _onResourceTreeModelLoaded(event) {
     var resourceTreeModel = /** @type {!SDK.ResourceTreeModel} */ (event.data);
-    if (resourceTreeModel.target() !== SDK.targetManager.mainTarget())
-      return;
-    SDK.targetManager.removeModelListener(
-        SDK.ResourceTreeModel, SDK.ResourceTreeModel.Events.CachedResourcesLoaded, this._onResourceTreeModelLoaded,
-        this);
+    resourceTreeModel.removeEventListener(
+        SDK.ResourceTreeModel.Events.CachedResourcesLoaded, this._onResourceTreeModelLoaded, this);
     this._fetchMultitargetMessages();
   }
 
   _fetchMultitargetMessages() {
     SDK.multitargetConsoleModel.addEventListener(SDK.ConsoleModel.Events.ConsoleCleared, this._consoleCleared, this);
     SDK.multitargetConsoleModel.addEventListener(
         SDK.ConsoleModel.Events.MessageAdded, this._onConsoleMessageAdded, this);
     SDK.multitargetConsoleModel.addEventListener(
         SDK.ConsoleModel.Events.MessageUpdated, this._onConsoleMessageUpdated, this);
     SDK.multitargetConsoleModel.addEventListener(
@@ skipping 34 matching lines @@
    */
   minimumRowHeight() {
     return 16;
   }
 
   /**
    * @override
    * @param {!SDK.Target} target
    */
   targetAdded(target) {
+    if (target === SDK.targetManager.mainTarget())
+      this._initConsoleMessages(target);
     this._viewport.invalidate();
   }
 
   /**
    * @override
    * @param {!SDK.Target} target
    */
   targetRemoved(target) {
   }
 
@@ skipping 1029 matching lines @@
         return true;
     }
     return false;
   }
 };
 
 /**
  * @typedef {{messageIndex: number, matchIndex: number}}
  */
 Console.ConsoleView.RegexMatchRange;