Issue 2738 - Make RegExpFilter.matches() take a bit mask instead of content type string

chrome/content/ui/sidebar.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 1076 matching lines @@
     }
 
     // Add new item to the list
     // Store original item in orig property - reading out prototype is messed up in Gecko 1.9.2
     item = {__proto__: item, orig: item, nodes: [node]};
     this.allData.push(item);
     this.dataMap[key] = item;
 
     // Show disabled filters if no other filter applies
     if (!item.filter)
-      item.filter = disabledMatcher.matchesAny(item.location, item.typeDescr, item.docDomain, item.thirdParty);
+      item.filter = disabledMatcher.matchesAny(item.location, RegExpFilter.toTypeMask(item.typeDescr), item.docDomain, item.thirdParty);
 
     if (!this.matchesFilter(item))
       return;
 
     let index = -1;
     if (this.sortProc && this.sortColumn && this.sortColumn.id == "size")
     {
       // Sorting by size requires accessing content document, and that's
       // dangerous from a content policy (and we are likely called directly
       // from a content policy call). Size data will be inaccurate anyway,
@@ skipping 34 matching lines @@
       this.boxObject.ensureRowIsVisible(this.selection.currentIndex);
   },
 
   updateFilters: function()
   {
     for (let item of this.allData)
     {
       if (item.filter instanceof RegExpFilter && item.filter.disabled)
         delete item.filter;
       if (!item.filter)
-        item.filter = disabledMatcher.matchesAny(item.location, item.typeDescr, item.docDomain, item.thirdParty);
+        item.filter = disabledMatcher.matchesAny(item.location, RegExpFilter.toTypeMask(item.typeDescr), item.docDomain, item.thirdParty);
     }
     this.refilter();
   },
 
   /**
    * Updates the list after a filter or sorting change.
    */
   refilter: function()
   {
     if (this.resortTimeout)
@@ skipping 99 matching lines @@
       return {tooltip: this.itemsDummyTooltip};
   },
 
   invalidateItem: function(item)
   {
     let row = this.data.indexOf(item);
     if (row >= 0)
       this.boxObject.invalidateRow(row);
   }
 }