| Index: third_party/WebKit/Source/devtools/front_end/bindings/PresentationConsoleMessageHelper.js
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/bindings/PresentationConsoleMessageHelper.js b/third_party/WebKit/Source/devtools/front_end/bindings/PresentationConsoleMessageHelper.js
|
| index cb1e5870959ca30d6528c81fefb4127d0bbe5a9d..bc208e51a772a8fa06252a000c344812b75eb575 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/bindings/PresentationConsoleMessageHelper.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/bindings/PresentationConsoleMessageHelper.js
|
| @@ -38,15 +38,17 @@ Bindings.PresentationConsoleMessageHelper = class {
|
| constructor(workspace) {
|
| this._workspace = workspace;
|
|
|
| - /** @type {!Object.<string, !Array.<!SDK.ConsoleMessage>>} */
|
| + /** @type {!Object.<string, !Array.<!ConsoleModel.ConsoleMessage>>} */
|
| this._pendingConsoleMessages = {};
|
|
|
| /** @type {!Array.<!Bindings.PresentationConsoleMessage>} */
|
| this._presentationConsoleMessages = [];
|
|
|
| - SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.ConsoleCleared, this._consoleCleared, this);
|
| - SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, this._onConsoleMessageAdded, this);
|
| - SDK.consoleModel.messages().forEach(this._consoleMessageAdded, this);
|
| + ConsoleModel.consoleModel.addEventListener(
|
| + ConsoleModel.ConsoleModel.Events.ConsoleCleared, this._consoleCleared, this);
|
| + ConsoleModel.consoleModel.addEventListener(
|
| + ConsoleModel.ConsoleModel.Events.MessageAdded, this._onConsoleMessageAdded, this);
|
| + ConsoleModel.consoleModel.messages().forEach(this._consoleMessageAdded, this);
|
| // TODO(dgozman): setImmediate because we race with DebuggerWorkspaceBinding on ParsedScriptSource event delivery.
|
| SDK.targetManager.addModelListener(
|
| SDK.DebuggerModel, SDK.DebuggerModel.Events.ParsedScriptSource,
|
| @@ -64,12 +66,12 @@ Bindings.PresentationConsoleMessageHelper = class {
|
| * @param {!Common.Event} event
|
| */
|
| _onConsoleMessageAdded(event) {
|
| - var message = /** @type {!SDK.ConsoleMessage} */ (event.data);
|
| + var message = /** @type {!ConsoleModel.ConsoleMessage} */ (event.data);
|
| this._consoleMessageAdded(message);
|
| }
|
|
|
| /**
|
| - * @param {!SDK.ConsoleMessage} message
|
| + * @param {!ConsoleModel.ConsoleMessage} message
|
| */
|
| _consoleMessageAdded(message) {
|
| if (!message.isErrorOrWarning())
|
| @@ -83,7 +85,7 @@ Bindings.PresentationConsoleMessageHelper = class {
|
| }
|
|
|
| /**
|
| - * @param {!SDK.ConsoleMessage} message
|
| + * @param {!ConsoleModel.ConsoleMessage} message
|
| * @return {?SDK.DebuggerModel.Location}
|
| */
|
| _rawLocation(message) {
|
| @@ -103,18 +105,18 @@ Bindings.PresentationConsoleMessageHelper = class {
|
| }
|
|
|
| /**
|
| - * @param {!SDK.ConsoleMessage} message
|
| + * @param {!ConsoleModel.ConsoleMessage} message
|
| * @param {!SDK.DebuggerModel.Location} rawLocation
|
| */
|
| _addConsoleMessageToScript(message, rawLocation) {
|
| - if (message.source === SDK.ConsoleMessage.MessageSource.Violation)
|
| + if (message.source === ConsoleModel.ConsoleMessage.MessageSource.Violation)
|
| return;
|
| this._presentationConsoleMessages.push(
|
| new Bindings.PresentationConsoleMessage(message, rawLocation, this._locationPool));
|
| }
|
|
|
| /**
|
| - * @param {!SDK.ConsoleMessage} message
|
| + * @param {!ConsoleModel.ConsoleMessage} message
|
| */
|
| _addPendingConsoleMessage(message) {
|
| if (!message.url)
|
| @@ -170,13 +172,13 @@ Bindings.PresentationConsoleMessageHelper = class {
|
| */
|
| Bindings.PresentationConsoleMessage = class {
|
| /**
|
| - * @param {!SDK.ConsoleMessage} message
|
| + * @param {!ConsoleModel.ConsoleMessage} message
|
| * @param {!SDK.DebuggerModel.Location} rawLocation
|
| * @param {!Bindings.LiveLocationPool} locationPool
|
| */
|
| constructor(message, rawLocation, locationPool) {
|
| this._text = message.messageText;
|
| - this._level = message.level === SDK.ConsoleMessage.MessageLevel.Error ?
|
| + this._level = message.level === ConsoleModel.ConsoleMessage.MessageLevel.Error ?
|
| Workspace.UISourceCode.Message.Level.Error :
|
| Workspace.UISourceCode.Message.Level.Warning;
|
| Bindings.debuggerWorkspaceBinding.createLiveLocation(rawLocation, this._updateLocation.bind(this), locationPool);
|
|
|