Index: third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js |
diff --git a/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js b/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js |
index 921bec5562cca0d3403ed02021cff39ff3ce6730..6b808ca0887f6b742d0905c2c9dec0c54bd9971e 100644 |
--- a/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js |
+++ b/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js |
@@ -28,7 +28,6 @@ |
*/ |
/** |
* @implements {UI.Searchable} |
- * @implements {SDK.TargetManager.Observer} |
* @implements {Console.ConsoleViewportProvider} |
* @unrestricted |
*/ |
@@ -162,7 +161,6 @@ Console.ConsoleView = class extends UI.VBox { |
this._timestampsSetting.addChangeListener(this._consoleTimestampsSettingChanged, this); |
this._registerWithMessageSink(); |
- SDK.targetManager.observeTargets(this); |
UI.context.addFlavorChangeListener(SDK.ExecutionContext, this._executionContextChanged, this); |
@@ -170,6 +168,18 @@ Console.ConsoleView = class extends UI.VBox { |
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(); |
} |
/** |
@@ -202,42 +212,6 @@ Console.ConsoleView = class extends UI.VBox { |
} |
/** |
- * @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} |
*/ |
@@ -271,23 +245,6 @@ Console.ConsoleView = class extends UI.VBox { |
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); |