Persist network panel resource type filter.

+minor refactoring.

BUG=354131

Review URL: https://codereview.chromium.org/212933011

git-svn-id: svn://svn.chromium.org/blink/trunk@170282 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/devtools/front_end/ConsoleView.js

@@ -896,13 +896,14 @@ WebInspector.ConsoleViewFilter.prototype = {
         this._textFilterUI.addEventListener(WebInspector.FilterUI.Events.FilterChanged, this._textFilterChanged, this);
         filterBar.addFilter(this._textFilterUI);
 
-        this._levelFilterUI = new WebInspector.NamedBitSetFilterUI();
-        this._levelFilterUI.addBit("error", WebInspector.UIString("Errors"));
-        this._levelFilterUI.addBit("warning", WebInspector.UIString("Warnings"));
-        this._levelFilterUI.addBit("info", WebInspector.UIString("Info"));
-        this._levelFilterUI.addBit("log", WebInspector.UIString("Logs"));
-        this._levelFilterUI.addBit("debug", WebInspector.UIString("Debug"));
-        this._levelFilterUI.bindSetting(WebInspector.settings.messageLevelFilters);
+        var levels = [
+            {name: "error", label: WebInspector.UIString("Errors")},
+            {name: "warning", label: WebInspector.UIString("Warnings")},
+            {name: "info", label: WebInspector.UIString("Info")},
+            {name: "log", label: WebInspector.UIString("Logs")},
+            {name: "debug", label: WebInspector.UIString("Debug")}
+        ];
+        this._levelFilterUI = new WebInspector.NamedBitSetFilterUI(levels, WebInspector.settings.messageLevelFilters);
         this._levelFilterUI.addEventListener(WebInspector.FilterUI.Events.FilterChanged, this._filterChanged, this);
         filterBar.addFilter(this._levelFilterUI);
     },

third_party/WebKit/Source/devtools/front_end/FilterBar.js

@@ -437,10 +437,12 @@ WebInspector.TextFilterUI.SuggestionBuilder.prototype = {
 
 /**
  * @constructor
- * @implements {WebInspector.FilterUI}
  * @extends {WebInspector.Object}
+ * @implements {WebInspector.FilterUI}
+ * @param {!Array.<!WebInspector.NamedBitSetFilterUI.Item>} items
+ * @param {!WebInspector.Setting=} setting
  */
-WebInspector.NamedBitSetFilterUI = function()
+WebInspector.NamedBitSetFilterUI = function(items, setting)
 {
     this._filtersElement = document.createElement("div");
     this._filtersElement.className = "filter-bitset-filter status-bar-item";
@@ -448,11 +450,24 @@ WebInspector.NamedBitSetFilterUI = function()
 
     this._allowedTypes = {};
     this._typeFilterElements = {};
-    this.addBit(WebInspector.NamedBitSetFilterUI.ALL_TYPES, WebInspector.UIString("All"));
+    this._addBit(WebInspector.NamedBitSetFilterUI.ALL_TYPES, WebInspector.UIString("All"));
     this._filtersElement.createChild("div", "filter-bitset-filter-divider");
-    this._toggleTypeFilter(WebInspector.NamedBitSetFilterUI.ALL_TYPES, false);
+
+    for (var i = 0; i < items.length; ++i)
+        this._addBit(items[i].name, items[i].label);
+
+    if (setting) {
+        this._setting = setting;
+        setting.addChangeListener(this._settingChanged.bind(this));
+        this._settingChanged();
+    } else {
+        this._toggleTypeFilter(WebInspector.NamedBitSetFilterUI.ALL_TYPES, false);
+    }
 }
 
+/** @typedef {{name: string, label: string}} */
+WebInspector.NamedBitSetFilterUI.Item;
+
 WebInspector.NamedBitSetFilterUI.ALL_TYPES = "all";
 
 WebInspector.NamedBitSetFilterUI.prototype = {
@@ -464,17 +479,6 @@ WebInspector.NamedBitSetFilterUI.prototype = {
         return !this._allowedTypes[WebInspector.NamedBitSetFilterUI.ALL_TYPES];
     },
 
-    /**
-     * @param {!WebInspector.Setting} setting
-     */
-    bindSetting: function(setting)
-    {
-        console.assert(!this._setting);
-        this._setting = setting;
-        setting.addChangeListener(this._settingChanged.bind(this));
-        this._settingChanged();
-    },
-
     /**
      * @return {!Element}
      */
@@ -518,7 +522,7 @@ WebInspector.NamedBitSetFilterUI.prototype = {
      * @param {string} name
      * @param {string} label
      */
-    addBit: function(name, label)
+    _addBit: function(name, label)
     {
         var typeFilterElement = this._filtersElement.createChild("li", name);
         typeFilterElement.typeName = name;

third_party/WebKit/Source/devtools/front_end/NetworkPanel.js

@@ -109,11 +109,12 @@ WebInspector.NetworkLogView.prototype = {
         this._textFilterUI.addEventListener(WebInspector.FilterUI.Events.FilterChanged, this._filterChanged, this);
         this._filterBar.addFilter(this._textFilterUI);
 
-        this._resourceTypeFilterUI = new WebInspector.NamedBitSetFilterUI();
+        var types = [];
         for (var typeId in WebInspector.resourceTypes) {
             var resourceType = WebInspector.resourceTypes[typeId];
-            this._resourceTypeFilterUI.addBit(resourceType.name(), resourceType.categoryTitle());
+            types.push({name: resourceType.name(), label: resourceType.categoryTitle()});
         }
+        this._resourceTypeFilterUI = new WebInspector.NamedBitSetFilterUI(types, WebInspector.settings.networkResourceTypeFilters);
         this._resourceTypeFilterUI.addEventListener(WebInspector.FilterUI.Events.FilterChanged, this._filterChanged.bind(this), this);
         this._filterBar.addFilter(this._resourceTypeFilterUI);
 

third_party/WebKit/Source/devtools/front_end/Settings.js

@@ -101,6 +101,7 @@ WebInspector.Settings = function()
     this.workerInspectorHeight = this.createSetting("workerInspectorHeight", 600);
     this.messageURLFilters = this.createSetting("messageURLFilters", {});
     this.networkHideDataURL = this.createSetting("networkHideDataURL", false);
+    this.networkResourceTypeFilters = this.createSetting("networkResourceTypeFilters", {});
     this.messageLevelFilters = this.createSetting("messageLevelFilters", {});
     this.splitVerticallyWhenDockedToRight = this.createSetting("splitVerticallyWhenDockedToRight", true);
     this.visiblePanels = this.createSetting("visiblePanels", {});