Update adblockpluscore to ebfc7b0 (#2046)

Author: mjethani

packages/adblocker-benchmarks/Makefile

@@ -4,10 +4,10 @@ all: deps run
 requests.json:
 	curl https://cdn.cliqz.com/adblocking/requests_top500.json.gz | gunzip > requests.json
 
-# VERSION: a15e8020d092f7b9f96834d237b6ca560c6b4335
+# VERSION: ebfc7b0300879ad44dba6a051c3c34b508b5a4f7
 ./blockers/adblockpluscore:
-	git clone --branch=next https://github.com/adblockplus/adblockpluscore.git ./blockers/adblockpluscore
-	cd ./blockers/adblockpluscore && git reset --hard a15e8020d092f7b9f96834d237b6ca560c6b4335
+	git clone https://github.com/adblockplus/adblockpluscore.git ./blockers/adblockpluscore
+	cd ./blockers/adblockpluscore && git reset --hard ebfc7b0300879ad44dba6a051c3c34b508b5a4f7
 
 adblockpluscore: ./blockers/adblockpluscore
 

packages/adblocker-benchmarks/blockers/adblockplus.js

@@ -6,18 +6,19 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
+const { contentTypes } = require('./adblockpluscore/lib/contentTypes.js');
 const { CombinedMatcher } = require('./adblockpluscore/lib/matcher.js');
-const { Filter, RegExpFilter } = require('./adblockpluscore/lib/filterClasses.js');
+const { Filter } = require('./adblockpluscore/lib/filterClasses.js');
 const { parseURL } = require('./adblockpluscore/lib/url.js');
 
 // Chrome can't distinguish between OBJECT_SUBREQUEST and OBJECT requests.
-RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT;
+contentTypes.OBJECT_SUBREQUEST = contentTypes.OBJECT;
 
 // Map of content types reported by the browser to the respecitve content types
 // used by Adblock Plus. Other content types are simply mapped to OTHER.
 const resourceTypes = new Map(
   (function* resourceTypesGenerator() {
-    for (const type in RegExpFilter.typeMap) yield [type.toLowerCase(), type];
+    for (const type in contentTypes) yield [type.toLowerCase(), type];
 
     yield ['sub_frame', 'SUBDOCUMENT'];
 
@@ -41,7 +42,7 @@ module.exports = class AdBlockPlus {
       const line = lines[i].trim();
       if (line.length !== 0 && line[0] !== '!') {
         const filter = Filter.fromText(line);
-        if (filter.type === 'blocking' || filter.type === 'whitelist') {
+        if (filter.type === 'blocking' || filter.type === 'allowing') {
           filters.push(filter);
           matcher.add(filter);
         }
@@ -79,9 +80,9 @@ module.exports = class AdBlockPlus {
   match(request) {
     const url = parseURL(request.url);
     const sourceURL = parseURL(request.frameUrl);
-    const filter = this.matcher.matchesAny(
+    const filter = this.matcher.match(
       url,
-      RegExpFilter.typeMap[resourceTypes.get(request.type) || 'OTHER'],
+      contentTypes[resourceTypes.get(request.type) || 'OTHER'],
       sourceURL.hostname,
       null,
       false,