DevTools: remove unrestricted in console filter and group

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 459 matching lines @@
       return;
     }
 
     if (this._tryToCollapseMessages(viewMessage, this._visibleViewMessages.peekLast()))
       return;
 
     var lastMessage = this._visibleViewMessages.peekLast();
     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()) {
       var originatingMessage = viewMessage.consoleMessage().originatingMessage();
       if (lastMessage && originatingMessage && lastMessage.consoleMessage() === originatingMessage)
         lastMessage.toMessageElement().classList.add('console-adjacent-user-command-result');
 
       this._visibleViewMessages.push(viewMessage);
       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();
   }
 
   _messageAppendedForTests() {
     // This method is sniffed in tests.
   }
 
   /**
    * @param {!ConsoleModel.ConsoleMessage} message
@@ skipping 467 matching lines @@
     this._promptTextChangedForTest();
   }
 
   _promptTextChangedForTest() {
     // This method is sniffed in tests.
   }
 };
 
 Console.ConsoleView.persistedHistorySize = 300;
 
-/**
- * @unrestricted
- */
 Console.ConsoleViewFilter = class {
   /**
    * @param {function()} filterChangedCallback
    */
   constructor(filterChangedCallback) {
     this._filterChanged = filterChangedCallback;
 
     this._messageURLFiltersSetting = Common.settings.createSetting('messageURLFilters', {});
     this._messageLevelFiltersSetting = Console.ConsoleViewFilter.levelFilterSetting();
 
     this._hideNetworkMessagesSetting = Common.moduleSetting('hideNetworkMessages');
     this._filterByExecutionContextSetting = Common.moduleSetting('selectedContextFilterEnabled');
     this._filterByConsoleAPISetting = Common.moduleSetting('consoleAPIFilterEnabled');
 
     this._messageURLFiltersSetting.addChangeListener(this._filterChanged);
     this._messageLevelFiltersSetting.addChangeListener(this._filterChanged);
     this._hideNetworkMessagesSetting.addChangeListener(this._filterChanged);
     this._filterByExecutionContextSetting.addChangeListener(this._filterChanged);
     this._filterByConsoleAPISetting.addChangeListener(this._filterChanged);
 
     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');
     this._levelLabels[ConsoleModel.ConsoleMessage.MessageLevel.Info] = Common.UIString('Info');
     this._levelLabels[ConsoleModel.ConsoleMessage.MessageLevel.Warning] = Common.UIString('Warnings');
     this._levelLabels[ConsoleModel.ConsoleMessage.MessageLevel.Error] = Common.UIString('Errors');
 
     this._levelMenuButton = new UI.ToolbarText('');
     this._levelMenuButtonArrow = new UI.ToolbarItem(UI.Icon.create('smallicon-triangle-down'));
     this._levelMenuButton.element.addEventListener('click', this._showLevelContextMenu.bind(this));
@@ skipping 224 matching lines @@
   }
 };
 
 /**
  * The maximum length before strings are considered too long for syntax highlighting.
  * @const
  * @type {number}
  */
 Console.ConsoleCommand.MaxLengthToIgnoreHighlighter = 10000;
 
-/**
- * @unrestricted
- */
 Console.ConsoleCommandResult = class extends Console.ConsoleViewMessage {
   /**
    * @param {!ConsoleModel.ConsoleMessage} message
    * @param {!Components.Linkifier} linkifier
    * @param {!ProductRegistry.BadgePool} badgePool
    * @param {number} nestingLevel
    */
   constructor(message, linkifier, badgePool, nestingLevel) {
     super(message, linkifier, badgePool, nestingLevel);
   }
 
   /**
    * @override
    * @return {!Element}
    */
   contentElement() {
     var element = super.contentElement();
     if (!element.classList.contains('console-user-command-result')) {
       element.classList.add('console-user-command-result');
       if (this.consoleMessage().level === ConsoleModel.ConsoleMessage.MessageLevel.Info) {
         var icon = UI.Icon.create('smallicon-command-result', 'command-result-icon');
         element.insertBefore(icon, element.firstChild);
       }
     }
     return element;
   }
 };
 
-/**
- * @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 parameters in here

[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);
   }
 
   /**
    * @return {boolean}
    */
   messagesHidden() {
     return this._messagesHidden;
   }
 
   /**
    * @return {number}
    */
   nestingLevel() {
     return this._nestingLevel;
   }
 
   /**
    * @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 {
   /**
    * @override
    * @param {!UI.Context} context
    * @param {string} actionId
    * @return {boolean}
    */
   handleAction(context, actionId) {
     switch (actionId) {
       case 'console.show':
         Common.console.show();
         return true;
       case 'console.clear':
         Console.ConsoleView.clearConsole();
         return true;
       case 'console.clear.history':
         Console.ConsoleView.instance()._clearHistory();
         return true;
     }
     return false;
   }
 };
 
 /**
  * @typedef {{messageIndex: number, matchIndex: number}}
  */
 Console.ConsoleView.RegexMatchRange;