Issue 6933 - Update adblockpluscore dependency to hg:dcda4859fcbd

lib/devtools.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/>.
  */
 
 "use strict";
 
 const {RegExpFilter,
        WhitelistFilter,
        ElemHideFilter} = require("../adblockpluscore/lib/filterClasses");
 const {SpecialSubscription} =
   require("../adblockpluscore/lib/subscriptionClasses");
 const {FilterStorage} = require("../adblockpluscore/lib/filterStorage");
 const {defaultMatcher} = require("../adblockpluscore/lib/matcher");
-const {FilterNotifier} = require("../adblockpluscore/lib/filterNotifier");
+const {filterNotifier} = require("../adblockpluscore/lib/filterNotifier");
 const {extractHostFromFrame} = require("./url");
 const {port} = require("./messaging");
 const {HitLogger, nonRequestTypes} = require("./hitLogger");
 
 let panels = new Map();
 
 function isActivePanel(panel)
 {
   return panel && !panel.reload && !panel.reloading;
 }
 
 function getActivePanel(tabId)
 {
   let panel = panels.get(tabId);
   if (isActivePanel(panel))
     return panel;
   return null;
 }
 
 function getFilterInfo(filter)
 {
   if (!filter)
     return null;
 
   let userDefined = false;
   let subscriptionTitle = null;
 
-  for (let subscription of filter.subscriptions)
+  for (let subscription of filter.subscriptions())
   {
     if (!subscription.disabled)
     {
       if (subscription instanceof SpecialSubscription)
         userDefined = true;
       else
         subscriptionTitle = subscription.title;
     }
   }
 
@@ skipping 181 matching lines @@
     {
       urls: ["http://*/*", "https://*/*"],
       types: ["main_frame"],
       tabId: inspectedTabId
     }
   );
 
   if (panels.size == 0)
   {
     ext.pages.onLoading.addListener(onLoading);
-    FilterNotifier.on("filter.added", onFilterAdded);
-    FilterNotifier.on("filter.removed", onFilterRemoved);
-    FilterNotifier.on("subscription.added", onSubscriptionAdded);
+    filterNotifier.on("filter.added", onFilterAdded);
+    filterNotifier.on("filter.removed", onFilterRemoved);
+    filterNotifier.on("subscription.added", onSubscriptionAdded);
   }
 
   newPort.onDisconnect.addListener(() =>
   {
     HitLogger.removeListener(inspectedTabId, hitListener);
     panels.delete(inspectedTabId);
     browser.webRequest.onBeforeRequest.removeListener(localOnBeforeRequest);
 
     if (panels.size == 0)
     {
       ext.pages.onLoading.removeListener(onLoading);
-      FilterNotifier.off("filter.added", onFilterAdded);
-      FilterNotifier.off("filter.removed", onFilterRemoved);
-      FilterNotifier.off("subscription.added", onSubscriptionAdded);
+      filterNotifier.off("filter.added", onFilterAdded);
+      filterNotifier.off("filter.removed", onFilterRemoved);
+      filterNotifier.off("subscription.added", onSubscriptionAdded);
     }
   });
 
   HitLogger.addListener(inspectedTabId, hitListener);
   panels.set(inspectedTabId, panel);
 });