Issue 4722 - Drop support for Chrome 41 - 48

lib/requestBlocker.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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
@@ skipping 11 matching lines @@
 let {Filter, RegExpFilter, BlockingFilter} = require("filterClasses");
 let {Subscription} = require("subscriptionClasses");
 let {defaultMatcher} = require("matcher");
 let {FilterNotifier} = require("filterNotifier");
 let {Prefs} = require("prefs");
 let {checkWhitelisted, getKey} = require("whitelisting");
 let {stringifyURL, extractHostFromFrame, isThirdParty} = require("url");
 let {port} = require("messaging");
 let devtools = require("devtools");
 
-ext.webRequest.getIndistinguishableTypes().forEach(types =>
-{
-  for (let i = 1; i < types.length; i++)
-    RegExpFilter.typeMap[types[i]] = RegExpFilter.typeMap[types[0]];
-});

[Wladimir Palant, 2016/12/13 14:15:02]

This code is still needed to deal with OBJECT and OBJECT_SUBREQUEST.

[kzar, 2016/12/13 15:05:40]

Done.

-
 function onBeforeRequestAsync(page, url, type, docDomain,
                               thirdParty, sitekey,
                               specificOnly, filter)
 {
   if (filter)
     FilterNotifier.emit("filter.hitCount", filter, 0, 0, page);
 
   if (devtools)
     devtools.logRequest(
       page, url, type, docDomain,
@@ skipping 109 matching lines @@
 
 port.on("request.websocket", function(msg, sender)
 {
   return ext.webRequest.onBeforeRequest._dispatch(
     new URL(msg.url),
     "WEBSOCKET",
     sender.page,
     sender.frame
   ).indexOf(false) != -1;
 });