Issue 7054 - Update the adblockpluscore dependency to 5cb695da5a40, adblockplusui to f86abf2efdfd

lib/hitLogger.js

Index: lib/hitLogger.js
===================================================================
--- a/lib/hitLogger.js
+++ b/lib/hitLogger.js
@@ -16,17 +16,17 @@
  */
 
 /** @module hitLogger */
 
 "use strict";
 
 const {extractHostFromFrame} = require("./url");
 const {EventEmitter} = require("../adblockpluscore/lib/events");
-const {FilterStorage} = require("../adblockpluscore/lib/filterStorage");
+const {filterStorage} = require("../adblockpluscore/lib/filterStorage");
 const {port} = require("./messaging");
 const {RegExpFilter,
        ElemHideFilter} = require("../adblockpluscore/lib/filterClasses");
 
 const nonRequestTypes = exports.nonRequestTypes = [
   "DOCUMENT", "ELEMHIDE", "SNIPPET", "GENERICBLOCK", "GENERICHIDE", "CSP"
 ];
 
@@ -104,22 +104,22 @@
  * @param {string[]} selectors  The selectors of applied ElemHideFilters
  * @param {string[]} filters    The text of applied ElemHideEmulationFilters
  * @param {string}   docDomain  The hostname of the document
  */
 function logHiddenElements(tabId, selectors, filters, docDomain)
 {
   if (HitLogger.hasListener(tabId))
   {
-    for (let subscription of FilterStorage.subscriptions)
+    for (let subscription of filterStorage.subscriptions())
     {
       if (subscription.disabled)
         continue;
 
-      for (let filter of subscription.filters)
+      for (let filter of subscription.filters())
       {
         // We only know the exact filter in case of element hiding emulation.
         // For regular element hiding filters, the content script only knows
         // the selector, so we have to find a filter that has an identical
         // selector and is active on the domain the match was reported from.
         let isActiveElemHideFilter = filter instanceof ElemHideFilter &&
                                      selectors.includes(filter.selector) &&
                                      filter.isActiveOnDomain(docDomain);