Issue 6933 - Update adblockpluscore dependency to hg:dcda4859fcbd

lib/requestBlocker.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 requestBlocker */
 
 "use strict";
 
 const {Filter, RegExpFilter, BlockingFilter} =
   require("../adblockpluscore/lib/filterClasses");
 const {Subscription} = require("../adblockpluscore/lib/subscriptionClasses");
 const {defaultMatcher} = require("../adblockpluscore/lib/matcher");
-const {FilterNotifier} = require("../adblockpluscore/lib/filterNotifier");
+const {filterNotifier} = require("../adblockpluscore/lib/filterNotifier");
 const {Prefs} = require("./prefs");
 const {checkWhitelisted, getKey} = require("./whitelisting");
 const {extractHostFromFrame, isThirdParty} = require("./url");
 const {port} = require("./messaging");
 const {logRequest: hitLoggerLogRequest} = require("./hitLogger");
 
 const extensionProtocol = new URL(browser.extension.getURL("")).protocol;
 
 // Chrome can't distinguish between OBJECT_SUBREQUEST and OBJECT requests.
 if (!browser.webRequest.ResourceType ||
@@ skipping 79 matching lines @@
                                      // an origin (proto + host).
   else
     return Promise.resolve([]);
 
   return browser.tabs.query({url}).then(tabs => tabs.map(tab => tab.id));
 }
 
 function logRequest(tabIds, request, filter)
 {
   if (filter)
-    FilterNotifier.emit("filter.hitCount", filter, 0, 0, tabIds);
+    filterNotifier.emit("filter.hitCount", filter, 0, 0, tabIds);
 
   hitLoggerLogRequest(tabIds, request, filter);
 }
 
 browser.webRequest.onBeforeRequest.addListener(details =>
 {
   // Never block top-level documents.
   if (details.type == "main_frame")
     return;
 
@@ skipping 180 matching lines @@
     // Defer handlerBehaviorChanged() until navigation occurs.
     // There wouldn't be any visible effect when calling it earlier,
     // but it's an expensive operation and that way we avoid to call
     // it multiple times, if multiple filters are added/removed.
     if (!browser.webNavigation.onBeforeNavigate
                               .hasListener(propagateHandlerBehaviorChange))
       browser.webNavigation.onBeforeNavigate
                            .addListener(propagateHandlerBehaviorChange);
 
     ignoreFilterNotifications = false;
-    FilterNotifier.emit("filter.behaviorChanged");
+    filterNotifier.emit("filter.behaviorChanged");
   });
 }
 
-FilterNotifier.on("subscription.added", onFilterChange);
-FilterNotifier.on("subscription.removed", onFilterChange);
-FilterNotifier.on("subscription.updated", onFilterChange);
-FilterNotifier.on("subscription.disabled", arg => onFilterChange(arg, true));
-FilterNotifier.on("filter.added", onFilterChange);
-FilterNotifier.on("filter.removed", onFilterChange);
-FilterNotifier.on("filter.disabled", arg => onFilterChange(arg, true));
-FilterNotifier.on("load", onFilterChange);
+filterNotifier.on("subscription.added", onFilterChange);
+filterNotifier.on("subscription.removed", arg => onFilterChange(arg, false));

[Manish Jethani, 2018/09/11 13:43:37]

Everything else is just simple renaming of things, while this is worth noting:
subscription.removed will get the old filters of the subscription (array) as its
second argument, so here we need to explicitly pass false (or not pass anything,
though I chose to do the former).

+filterNotifier.on("subscription.updated", onFilterChange);
+filterNotifier.on("subscription.disabled", arg => onFilterChange(arg, true));
+filterNotifier.on("filter.added", onFilterChange);
+filterNotifier.on("filter.removed", onFilterChange);
+filterNotifier.on("filter.disabled", arg => onFilterChange(arg, true));
+filterNotifier.on("load", onFilterChange);