DevTools: render console level filter as drop box.

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 41 matching lines @@
 
     /**
      * @type {!Array.<!Console.ConsoleView.RegexMatchRange>}
      */
     this._regexMatchRanges = [];
 
     this._executionContextComboBox = new UI.ToolbarComboBox(null, 'console-context');
     this._executionContextComboBox.setMaxWidth(200);
     this._consoleContextSelector = new Console.ConsoleContextSelector(this._executionContextComboBox.selectElement());
 
-    this._filter = new Console.ConsoleViewFilter(this);
-    this._filter.addEventListener(Console.ConsoleViewFilter.Events.FilterChanged, this._updateMessageList.bind(this));
+    this._showAllMessagesCheckbox = new UI.ToolbarCheckbox(Common.UIString('Show all messages'));
+    this._filter = new Console.ConsoleViewFilter(this._showAllMessagesCheckbox, this._updateMessageList.bind(this));
 
     this._filterBar = new UI.FilterBar('consoleView');
 
     this._preserveLogCheckbox = new UI.ToolbarCheckbox(
         Common.UIString('Preserve log'), Common.UIString('Do not clear log on page reload / navigation'),
         Common.moduleSetting('preserveConsoleLog'));
     this._progressToolbarItem = new UI.ToolbarItem(createElement('div'));
 
     var toolbar = new UI.Toolbar('', this._contentsElement);
     toolbar.appendToolbarItem(UI.Toolbar.createActionButton(
@@ skipping 14 matching lines @@
     this._messagesElement.id = 'console-messages';
     this._messagesElement.classList.add('monospace');
     this._messagesElement.addEventListener('click', this._messagesClicked.bind(this), true);
 
     this._viewportThrottler = new Common.Throttler(50);
 
     this._filterStatusMessageElement = createElementWithClass('div', 'console-message');
     this._messagesElement.insertBefore(this._filterStatusMessageElement, this._messagesElement.firstChild);
     this._filterStatusTextElement = this._filterStatusMessageElement.createChild('span', 'console-info');
     this._filterStatusMessageElement.createTextChild(' ');
-    var resetFiltersLink = this._filterStatusMessageElement.createChild('span', 'console-info link');
-    resetFiltersLink.textContent = Common.UIString('Show all messages.');
-    resetFiltersLink.addEventListener('click', this._filter.reset.bind(this._filter), true);
+    this._resetFiltersLink = createElementWithClass('span', 'link');
+    this._resetFiltersLink.textContent = Common.UIString('filters');
+    this._resetFiltersLink.addEventListener('click', () => this._filterBar.showOnce(), true);
 
     this._topGroup = Console.ConsoleGroup.createTopGroup();
     this._currentGroup = this._topGroup;
 
     this._promptElement = this._messagesElement.createChild('div', 'source-code');
     var promptIcon = UI.Icon.create('smallicon-text-prompt', 'console-prompt-icon');
     this._promptElement.appendChild(promptIcon);
     this._promptElement.id = 'console-prompt';
     this._promptElement.addEventListener('input', this._promptInput.bind(this), false);
 
     // FIXME: This is a workaround for the selection machinery bug. See crbug.com/410899
     var selectAllFixer = this._messagesElement.createChild('div', 'console-view-fix-select-all');
     selectAllFixer.textContent = '.';
 
-    this._showAllMessagesCheckbox = new UI.ToolbarCheckbox(Common.UIString('Show all messages'));
     this._showAllMessagesCheckbox.inputElement.checked = true;
     this._showAllMessagesCheckbox.inputElement.addEventListener('change', this._updateMessageList.bind(this), false);
 
     this._showAllMessagesCheckbox.element.classList.add('hidden');
 
     toolbar.appendToolbarItem(this._showAllMessagesCheckbox);
 
     this._registerShortcuts();
 
     this._messagesElement.addEventListener('contextmenu', this._handleContextMenuEvent.bind(this), false);
@@ skipping 300 matching lines @@
     // This functions is sniffed in tests.
   }
 
   _immediatelyScrollToBottom() {
     // This will scroll viewport and trigger its refresh.
     this._viewport.setStickToBottom(true);
     this._promptElement.scrollIntoView(true);
   }
 
   _updateFilterStatus() {
-    this._filterStatusTextElement.textContent = Common.UIString(
-        this._hiddenByFilterCount === 1 ? '%d message is hidden by filters.' : '%d messages are hidden by filters.',
-        this._hiddenByFilterCount);
+    this._filterStatusTextElement.removeChildren();
+    this._filterStatusTextElement.appendChild(UI.formatLocalized(
+        this._hiddenByFilterCount === 1 ? '1 message is hidden by %s.' :
+                                          this._hiddenByFilterCount + ' messages are hidden by %s.',
+        [this._resetFiltersLink]));
     this._filterStatusMessageElement.style.display = this._hiddenByFilterCount ? '' : 'none';
   }
 
   /**
    * @param {!Common.Event} event
    */
   _onConsoleMessageAdded(event) {
     var message = /** @type {!SDK.ConsoleMessage} */ (event.data);
     this._addConsoleMessage(message);
   }
@@ skipping 55 matching lines @@
    * @param {!Console.ConsoleViewMessage} viewMessage
    */
   _consoleMessageAddedForTest(viewMessage) {
   }
 
   /**
    * @param {!Console.ConsoleViewMessage} viewMessage
    */
   _appendMessageToEnd(viewMessage) {
     if (!this._filter.shouldBeVisible(viewMessage)) {
-      if (this._filter.shouldBeVisibleByDefault(viewMessage))
-        this._hiddenByFilterCount++;
+      this._hiddenByFilterCount++;
       return;
     }
 
     if (this._tryToCollapseMessages(viewMessage, this._visibleViewMessages.peekLast()))
       return;
 
     var lastMessage = this._visibleViewMessages.peekLast();
     if (viewMessage.consoleMessage().type === SDK.ConsoleMessage.MessageType.EndGroup) {
       if (lastMessage && !this._currentGroup.messagesHidden())
         lastMessage.incrementCloseGroupDecorationCount();
@@ skipping 72 matching lines @@
       filterSubMenu.appendItem(menuTitle, this._filter.addMessageURLFilter.bind(this._filter, consoleMessage.url));
     }
 
     filterSubMenu.appendSeparator();
     var unhideAll = filterSubMenu.appendItem(
         Common.UIString.capitalize('Unhide ^all'), this._filter.removeMessageURLFilter.bind(this._filter));
     filterSubMenu.appendSeparator();
 
     var hasFilters = false;
 
-    for (var url in this._filter.messageURLFilters) {
+    for (var url in this._filter.messageURLFilters()) {
       filterSubMenu.appendCheckboxItem(
           String.sprintf('%s (%d)', new Common.ParsedURL(url).displayName, this._urlToMessageCount[url]),
           this._filter.removeMessageURLFilter.bind(this._filter, url), true);
       hasFilters = true;
     }
 
     filterSubMenu.setEnabled(hasFilters || (consoleMessage && consoleMessage.url));
     unhideAll.setEnabled(hasFilters);
 
     contextMenu.appendSeparator();
@@ skipping 417 matching lines @@
   }
 };
 
 Console.ConsoleView.persistedHistorySize = 300;
 
 /**
  * @unrestricted
  */
 Console.ConsoleViewFilter = class extends Common.Object {
   /**
-   * @param {!Console.ConsoleView} view
+   * @param {!UI.ToolbarCheckbox} showAllMessagesCheckbox
+   * @param {function()} filterChangedCallback
    */
-  constructor(view) {
+  constructor(showAllMessagesCheckbox, filterChangedCallback) {
     super();
+    this._showAllMessagesCheckbox = showAllMessagesCheckbox;
+    this._filterChanged = filterChangedCallback;
+
     this._messageURLFiltersSetting = Common.settings.createSetting('messageURLFilters', {});
-    this._messageLevelFiltersSetting = Common.settings.createSetting('messageLevelFilters', {});
+    this._messageLevelFiltersSetting =
+        Common.settings.createSetting('messageLevelFilters2', SDK.ConsoleMessage.MessageLevel.Info);
+    this._hideNetworkMessagesSetting = Common.moduleSetting('hideNetworkMessages');
 
-    this._view = view;
-    this._messageURLFilters = this._messageURLFiltersSetting.get();
-    this._filterChanged = this.dispatchEventToListeners.bind(this, Console.ConsoleViewFilter.Events.FilterChanged);
+    this._messageURLFiltersSetting.addChangeListener(this._filterChanged);
+    this._messageLevelFiltersSetting.addChangeListener(this._filterChanged);
+    this._hideNetworkMessagesSetting.addChangeListener(this._filterChanged);
   }
 
   addFilters(filterBar) {
     this._textFilterUI = new UI.TextFilterUI(true);
     this._textFilterUI.addEventListener(UI.FilterUI.Events.FilterChanged, this._textFilterChanged, this);
     filterBar.addFilter(this._textFilterUI);
 
     this._hideNetworkMessagesCheckbox =
-        new UI.CheckboxFilterUI('', Common.UIString('Hide network'), true, Common.moduleSetting('hideNetworkMessages'));
-    this._hideViolationMessagesCheckbox = new UI.CheckboxFilterUI(
-        '', Common.UIString('Hide violations'), false, Common.moduleSetting('hideViolationMessages'));
-    Common.moduleSetting('hideNetworkMessages').addChangeListener(this._filterChanged, this);
-    Common.moduleSetting('hideViolationMessages').addChangeListener(this._filterChanged, this);
-    filterBar.addFilter(this._hideNetworkMessagesCheckbox);
-    filterBar.addFilter(this._hideViolationMessagesCheckbox);
+        new UI.CheckboxFilterUI('', Common.UIString('Hide network'), true, this._hideNetworkMessagesSetting);
 
     var levels = [
-      {name: SDK.ConsoleMessage.MessageLevel.Error, label: Common.UIString('Errors')},
-      {name: SDK.ConsoleMessage.MessageLevel.Warning, label: Common.UIString('Warnings')},
-      {name: SDK.ConsoleMessage.MessageLevel.Info, label: Common.UIString('Info')},
-      {name: SDK.ConsoleMessage.MessageLevel.Verbose, label: Common.UIString('Verbose')}
+      {value: SDK.ConsoleMessage.MessageLevel.Verbose, label: Common.UIString('Verbose')},
+      {value: SDK.ConsoleMessage.MessageLevel.Info, label: Common.UIString('Info'), default: true},
+      {value: SDK.ConsoleMessage.MessageLevel.Warning, label: Common.UIString('Warnings')},
+      {value: SDK.ConsoleMessage.MessageLevel.Error, label: Common.UIString('Errors')}
     ];
-    this._levelFilterUI = new UI.NamedBitSetFilterUI(levels, this._messageLevelFiltersSetting);
-    this._levelFilterUI.addEventListener(UI.FilterUI.Events.FilterChanged, this._filterChanged, this);
-    filterBar.addFilter(this._levelFilterUI);
+
+    var levelFilter = new UI.ComboBoxFilterUI(levels, Common.UIString('Level: '), this._messageLevelFiltersSetting);
+    filterBar.addFilter(levelFilter);
+    filterBar.addFilter(this._hideNetworkMessagesCheckbox);
   }
 
   _textFilterChanged(event) {
     this._filterRegex = this._textFilterUI.regex();
-
     this._filterChanged();
   }
 
   /**
    * @param {string} url
    */
   addMessageURLFilter(url) {
-    this._messageURLFilters[url] = true;
-    this._messageURLFiltersSetting.set(this._messageURLFilters);
-    this._filterChanged();
+    var value = this._messageURLFiltersSetting.get();
+    value[url] = true;
+    this._messageURLFiltersSetting.set(value);
   }
 
   /**
    * @param {string} url
    */
   removeMessageURLFilter(url) {
-    if (!url)
-      this._messageURLFilters = {};
-    else
-      delete this._messageURLFilters[url];
-
-    this._messageURLFiltersSetting.set(this._messageURLFilters);
-    this._filterChanged();
+    var value;
+    if (url) {
+      value = this._messageURLFiltersSetting.get();
+      delete value[url];
+    } else {
+      value = {};
+    }
+    this._messageURLFiltersSetting.set(value);
   }
 
   /**
    * @returns {!Object}
    */
-  get messageURLFilters() {
-    return this._messageURLFilters;
+  messageURLFilters() {
+    return this._messageURLFiltersSetting.get();
   }
 
   /**
    * @param {!Console.ConsoleViewMessage} viewMessage
    * @return {boolean}
    */
   shouldBeVisible(viewMessage) {
     var message = viewMessage.consoleMessage();
     var executionContext = UI.context.flavor(SDK.ExecutionContext);
     if (!message.target())
       return true;
 
-    if (!this._view._showAllMessagesCheckbox.checked() && executionContext) {
+    if (!this._showAllMessagesCheckbox.checked() && executionContext) {
       if (message.target() !== executionContext.target())
         return false;
       if (message.executionContextId && message.executionContextId !== executionContext.id)
         return false;
     }
 
     if (Common.moduleSetting('hideNetworkMessages').get() &&
         viewMessage.consoleMessage().source === SDK.ConsoleMessage.MessageSource.Network)
       return false;
 
-    if (Common.moduleSetting('hideViolationMessages').get() &&
-        viewMessage.consoleMessage().source === SDK.ConsoleMessage.MessageSource.Violation)
-      return false;
-
     if (viewMessage.consoleMessage().isGroupMessage())
       return true;
 
     if (message.type === SDK.ConsoleMessage.MessageType.Result ||
         message.type === SDK.ConsoleMessage.MessageType.Command)
       return true;
 
-    if (message.url && this._messageURLFilters[message.url])
+    if (message.url && this._messageURLFiltersSetting.get()[message.url])
       return false;
 
-    if (message.level && !this._levelFilterUI.accept(message.level))
+    var filterOrdinal = SDK.ConsoleMessage.MessageLevel.ordinal(
+        /** @type {!SDK.ConsoleMessage.MessageLevel} */ (this._messageLevelFiltersSetting.get()));
+    if (message.level && SDK.ConsoleMessage.MessageLevel.ordinal(message.level) < filterOrdinal)
       return false;
 
     if (this._filterRegex) {
       this._filterRegex.lastIndex = 0;
       if (!viewMessage.matchesFilterRegex(this._filterRegex))
         return false;
     }
 
     return true;
   }
 
-  /**
-   * @return {boolean}
-   */
-  shouldBeVisibleByDefault(viewMessage) {
-    return viewMessage.consoleMessage().source !== SDK.ConsoleMessage.MessageSource.Violation;
-  }
-
   reset() {
-    this._messageURLFilters = {};
-    this._messageURLFiltersSetting.set(this._messageURLFilters);
-    this._messageLevelFiltersSetting.set({});
-    this._view._showAllMessagesCheckbox.inputElement.checked = true;
+    this._messageURLFiltersSetting.set({});
+    this._messageLevelFiltersSetting.set(SDK.ConsoleMessage.MessageLevel.Info);
+    this._showAllMessagesCheckbox.inputElement.checked = true;
     Common.moduleSetting('hideNetworkMessages').set(false);
-    Common.moduleSetting('hideViolationMessages').set(true);
     this._textFilterUI.setValue('');
     this._filterChanged();
   }
 };
 
-/** @enum {symbol} */
-Console.ConsoleViewFilter.Events = {
-  FilterChanged: Symbol('FilterChanged')
-};
-
 /**
  * @unrestricted
  */
 Console.ConsoleCommand = class extends Console.ConsoleViewMessage {
   /**
    * @param {!SDK.ConsoleMessage} message
    * @param {!Components.Linkifier} linkifier
    * @param {number} nestingLevel
    */
   constructor(message, linkifier, nestingLevel) {
@@ skipping 138 matching lines @@
         return true;
     }
     return false;
   }
 };
 
 /**
  * @typedef {{messageIndex: number, matchIndex: number}}
  */
 Console.ConsoleView.RegexMatchRange;