[DevTools] Wait for cachedResourcesLoaded in ConsoleModel

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 10 matching lines @@
  * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /**
  * @implements {UI.Searchable}
- * @implements {SDK.TargetManager.Observer}
  * @implements {Console.ConsoleViewportProvider}
  * @unrestricted
  */
 Console.ConsoleView = class extends UI.VBox {
   constructor() {
     super();
     this.setMinimumSize(0, 35);
     this.registerRequiredCSS('console/consoleView.css');
 
     this._searchableView = new UI.SearchableView(this);
@@ skipping 113 matching lines @@
     this._consoleHistoryAutocompleteSetting.addChangeListener(this._consoleHistoryAutocompleteChanged, this);
 
     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);
 
     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);
+
+    ConsoleModel.consoleModel.addEventListener(
+        ConsoleModel.ConsoleModel.Events.ConsoleCleared, this._consoleCleared, this);
+    ConsoleModel.consoleModel.addEventListener(
+        ConsoleModel.ConsoleModel.Events.MessageAdded, this._onConsoleMessageAdded, this);
+    ConsoleModel.consoleModel.addEventListener(
+        ConsoleModel.ConsoleModel.Events.MessageUpdated, this._onConsoleMessageUpdated, this);
+    ConsoleModel.consoleModel.addEventListener(
+        ConsoleModel.ConsoleModel.Events.CommandEvaluated, this._commandEvaluated, this);
+    ConsoleModel.consoleModel.messages().forEach(this._addConsoleMessage, this);
+    if (this._consoleMessages.length)
+      this._viewport.invalidate();
   }
 
   /**
    * @return {!Console.ConsoleView}
    */
   static instance() {
     if (!Console.ConsoleView._instance)
       Console.ConsoleView._instance = new Console.ConsoleView();
     return Console.ConsoleView._instance;
   }
@@ skipping 12 matching lines @@
   _clearHistory() {
     this._consoleHistorySetting.set([]);
     this._prompt.history().setHistoryData([]);
   }
 
   _consoleHistoryAutocompleteChanged() {
     this._prompt.setAddCompletionsFromHistory(this._consoleHistoryAutocompleteSetting.get());
   }
 
   /**
-   * @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);
-    resourceTreeModel.removeEventListener(
-        SDK.ResourceTreeModel.Events.CachedResourcesLoaded, this._onResourceTreeModelLoaded, this);
-    this._fetchMultitargetMessages();
-  }
-
-  _fetchMultitargetMessages() {
-    ConsoleModel.consoleModel.addEventListener(
-        ConsoleModel.ConsoleModel.Events.ConsoleCleared, this._consoleCleared, this);
-    ConsoleModel.consoleModel.addEventListener(
-        ConsoleModel.ConsoleModel.Events.MessageAdded, this._onConsoleMessageAdded, this);
-    ConsoleModel.consoleModel.addEventListener(
-        ConsoleModel.ConsoleModel.Events.MessageUpdated, this._onConsoleMessageUpdated, this);
-    ConsoleModel.consoleModel.addEventListener(
-        ConsoleModel.ConsoleModel.Events.CommandEvaluated, this._commandEvaluated, this);
-    ConsoleModel.consoleModel.messages().forEach(this._addConsoleMessage, this);
-    this._viewport.invalidate();
-  }
-
-  /**
    * @override
    * @return {number}
    */
   itemCount() {
     return this._visibleViewMessages.length;
   }
 
   /**
    * @override
    * @param {number} index
@@ skipping 13 matching lines @@
   }
 
   /**
    * @override
    * @return {number}
    */
   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) {
-  }
-
   _registerWithMessageSink() {
     Common.console.messages().forEach(this._addSinkMessage, this);
     Common.console.addEventListener(Common.Console.Events.MessageAdded, messageAdded, this);
 
     /**
      * @param {!Common.Event} event
      * @this {Console.ConsoleView}
      */
     function messageAdded(event) {
       this._addSinkMessage(/** @type {!Common.Console.Message} */ (event.data));
@@ skipping 1020 matching lines @@
         return true;
     }
     return false;
   }
 };
 
 /**
  * @typedef {{messageIndex: number, matchIndex: number}}
  */
 Console.ConsoleView.RegexMatchRange;