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

qunit/common.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 {FilterStorage} = require("../adblockpluscore/lib/filterStorage");
+const {filterStorage} = require("../adblockpluscore/lib/filterStorage");
 const {Subscription} = require("../adblockpluscore/lib/subscriptionClasses");
 const {Filter} = require("../adblockpluscore/lib/filterClasses");
 const {defaultMatcher} = require("../adblockpluscore/lib/matcher");
 const {ElemHide} = require("../adblockpluscore/lib/elemHide");
 const {Prefs} = require("../lib/prefs");
 
 function prepareFilterComponents(keepListeners)
 {
-  FilterStorage.subscriptions = [];
-  FilterStorage.knownSubscriptions = Object.create(null);
+  filterStorage.subscriptions = [];
+  filterStorage.knownSubscriptions = Object.create(null);
   Subscription.knownSubscriptions = Object.create(null);
   Filter.knownFilters = Object.create(null);

[Jon Sonesen, 2019/01/04 00:36:28]

Is this code being used to re-initialize the objects? if so it seems I should
replace this with empty lists for filterStorage._subscriptions and
Filter._filters instead. Is that wrong?

[Jon Sonesen, 2019/01/04 01:12:21]

Nevermind I goofed and shouldn't be messing with those instead change it:

filterStorage.knownSubscriptions = new Map();
Subscription.knownSubscriptions = new Map();
Filter.knownFilters = new Map();

Is that more correct? Then also should I still set the private properties back
to an empty array?

[kzar, 2019/01/04 11:41:18]

It seems to me that this code isn't actually used anywhere, so I've opened #7191
and #7192 to remove it.

[kzar, 2019/01/04 15:48:20]

(I recommend removing all your changes to this file, that will make your life
easier later when you rebase again.)

 
   defaultMatcher.clear();
   ElemHide.clear();
 }
 
 function restoreFilterComponents()
 {
 }
 
 function executeFirstRunActions()
 {
 }