Issue 6933 - Update adblockpluscore dependency to hg:dcda4859fcbd

lib/whitelisting.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @module whitelisting */
 
 "use strict";
 
 const {defaultMatcher} = require("../adblockpluscore/lib/matcher");
 const {Filter, RegExpFilter} = require("../adblockpluscore/lib/filterClasses");
-const {FilterNotifier} = require("../adblockpluscore/lib/filterNotifier");
+const {filterNotifier} = require("../adblockpluscore/lib/filterNotifier");
 const {FilterStorage} = require("../adblockpluscore/lib/filterStorage");
 const {extractHostFromFrame, isThirdParty} = require("./url");
 const {port} = require("./messaging");
 const {logWhitelistedDocument} = require("./hitLogger");
 const {verifySignature} = require("../adblockpluscore/lib/rsa");
 
 let sitekeys = new ext.PageMap();
 
 function match(page, url, typeMask, docDomain, sitekey)
 {
@@ skipping 51 matching lines @@
 port.on("filters.isWhitelisted", message =>
 {
   return !!checkWhitelisted(new ext.Page(message.tab));
 });
 
 port.on("filters.whitelist", message =>
 {
   let page = new ext.Page(message.tab);
   let host = page.url.hostname.replace(/^www\./, "");
   let filter = Filter.fromText("@@||" + host + "^$document");
-  if (filter.subscriptions.length && filter.disabled)
+  if (filter.subscriptionCount && filter.disabled)
   {
     filter.disabled = false;
   }
   else
   {
     filter.disabled = false;
     FilterStorage.addFilter(filter);
   }
 });
 
 port.on("filters.unwhitelist", message =>
 {
   let page = new ext.Page(message.tab);
   // Remove any exception rules applying to this URL
   let filter = checkWhitelisted(page);
   while (filter)
   {
     FilterStorage.removeFilter(filter);
-    if (filter.subscriptions.length)
+    if (filter.subscriptionCount)
       filter.disabled = true;
     filter = checkWhitelisted(page);
   }
 });
 
 function revalidateWhitelistingState(page)
 {
-  FilterNotifier.emit(
+  filterNotifier.emit(
     "page.WhitelistingStateRevalidate",
     page, checkWhitelisted(page)
   );
 }
 
-FilterNotifier.on("filter.behaviorChanged", () =>
+filterNotifier.on("filter.behaviorChanged", () =>
 {
   browser.tabs.query({}, tabs =>
   {
     for (let tab of tabs)
       revalidateWhitelistingState(new ext.Page(tab));
   });
 });
 
 ext.pages.onLoading.addListener(revalidateWhitelistingState);
 
@@ skipping 94 matching lines @@
 {
   browser.webRequest.onHeadersReceived.addListener(
     onHeadersReceived,
     {
       urls: ["http://*/*", "https://*/*"],
       types: ["main_frame", "sub_frame"]
     },
     ["responseHeaders"]
   );
 }