Chromium Code Reviews| 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 b4d75916bd435c82c43c6e08f488ba290390f172..d3559b651be43247549a670abc4c27e0aab7d8e2 100644 |
| --- a/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js |
| +++ b/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js |
| @@ -477,7 +477,7 @@ Console.ConsoleView = class extends UI.VBox { |
| if (viewMessage.consoleMessage().type === ConsoleModel.ConsoleMessage.MessageType.EndGroup) { |
| if (lastMessage && !this._currentGroup.messagesHidden()) |
| lastMessage.incrementCloseGroupDecorationCount(); |
| - this._currentGroup = this._currentGroup.parentGroup(); |
| + this._currentGroup = this._currentGroup.parentGroup() || this._currentGroup; |
| return; |
| } |
| if (!this._currentGroup.messagesHidden()) { |
| @@ -489,8 +489,10 @@ Console.ConsoleView = class extends UI.VBox { |
| this._searchMessage(this._visibleViewMessages.length - 1); |
| } |
| - if (viewMessage.consoleMessage().isGroupStartMessage()) |
| - this._currentGroup = new Console.ConsoleGroup(this._currentGroup, viewMessage); |
| + if (viewMessage.consoleMessage().isGroupStartMessage()) { |
| + this._currentGroup = new Console.ConsoleGroup( |
| + /** @type {!Console.ConsoleGroupOptions} */ ({parentGroup: this._currentGroup, groupMessage: viewMessage})); |
| + } |
| this._messageAppendedForTests(); |
| } |
| @@ -978,9 +980,6 @@ Console.ConsoleView = class extends UI.VBox { |
| Console.ConsoleView.persistedHistorySize = 300; |
| -/** |
| - * @unrestricted |
| - */ |
| Console.ConsoleViewFilter = class { |
| /** |
| * @param {function()} filterChangedCallback |
| @@ -1003,6 +1002,9 @@ Console.ConsoleViewFilter = class { |
| this._textFilterUI = new UI.ToolbarInput(Common.UIString('Filter'), 0.2, 1, true); |
| this._textFilterUI.addEventListener(UI.ToolbarInput.Event.TextChanged, this._textFilterChanged, this); |
| + this._filterText = this._textFilterUI.value(); |
| + /** @type {?RegExp} */ |
| + this._filterRegex = null; |
| this._levelLabels = {}; |
| this._levelLabels[ConsoleModel.ConsoleMessage.MessageLevel.Verbose] = Common.UIString('Verbose'); |
| @@ -1247,9 +1249,6 @@ Console.ConsoleCommand = class extends Console.ConsoleViewMessage { |
| */ |
| Console.ConsoleCommand.MaxLengthToIgnoreHighlighter = 10000; |
| -/** |
| - * @unrestricted |
| - */ |
| Console.ConsoleCommandResult = class extends Console.ConsoleViewMessage { |
| /** |
| * @param {!ConsoleModel.ConsoleMessage} message |
| @@ -1278,26 +1277,27 @@ Console.ConsoleCommandResult = class extends Console.ConsoleViewMessage { |
| } |
| }; |
| -/** |
| - * @unrestricted |
| - */ |
| Console.ConsoleGroup = class { |
| /** |
| - * @param {?Console.ConsoleGroup} parentGroup |
| - * @param {?Console.ConsoleViewMessage} groupMessage |
| + * @param {?Console.ConsoleGroupOptions} options |
| */ |
| - constructor(parentGroup, groupMessage) { |
| - this._parentGroup = parentGroup; |
| - this._nestingLevel = parentGroup ? parentGroup.nestingLevel() + 1 : 0; |
| - this._messagesHidden = |
| - groupMessage && groupMessage.collapsed() || this._parentGroup && this._parentGroup.messagesHidden(); |
| + constructor(options) { |
|
lushnikov
2017/07/17 22:47:38
let's not have options object - just pass paramete
luoe
2017/07/17 23:38:21
Done.
|
| + if (options) { |
| + this._parentGroup = options.parentGroup; |
| + this._nestingLevel = this._parentGroup.nestingLevel() + 1; |
| + this._messagesHidden = options.groupMessage.collapsed() || this._parentGroup.messagesHidden(); |
| + } else { |
| + this._parentGroup = null; |
| + this._nestingLevel = 0; |
| + this._messagesHidden = false; |
| + } |
| } |
| /** |
| * @return {!Console.ConsoleGroup} |
| */ |
| static createTopGroup() { |
| - return new Console.ConsoleGroup(null, null); |
| + return new Console.ConsoleGroup(null); |
| } |
| /** |
| @@ -1318,14 +1318,17 @@ Console.ConsoleGroup = class { |
| * @return {?Console.ConsoleGroup} |
| */ |
| parentGroup() { |
| - return this._parentGroup || this; |
| + return this._parentGroup; |
| } |
| }; |
| +/** |
| + * @typedef {!{parentGroup: !Console.ConsoleGroup, groupMessage: !Console.ConsoleViewMessage}} |
| + */ |
| +Console.ConsoleGroupOptions; |
| /** |
| * @implements {UI.ActionDelegate} |
| - * @unrestricted |
| */ |
| Console.ConsoleView.ActionDelegate = class { |
| /** |