Issue 3860 - Move request blocking logic to a seperate module

background.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
  * 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/>.
  */
 
 with(require("filterClasses"))
 {
-  this.BlockingFilter = BlockingFilter;
+  this.RegExpFilter = RegExpFilter;
   this.WhitelistFilter = WhitelistFilter;
-  this.RegExpFilter = RegExpFilter;
-}
-with(require("whitelisting"))
-{
-  this.checkWhitelisted = checkWhitelisted;
-  this.getKey = getKey;
-}
-with(require("url"))
-{
-  this.stringifyURL = stringifyURL;
-  this.isThirdParty = isThirdParty;
-  this.extractHostFromFrame = extractHostFromFrame;
 }
 var FilterStorage = require("filterStorage").FilterStorage;
 var SpecialSubscription = require("subscriptionClasses").SpecialSubscription;
 var ElemHide = require("elemHide").ElemHide;
-var defaultMatcher = require("matcher").defaultMatcher;
-var Prefs = require("prefs").Prefs;
+var checkWhitelisted = require("whitelisting").checkWhitelisted;
+var extractHostFromFrame = require("url").extractHostFromFrame;
 var port = require("messaging").port;
 var devtools = require("devtools");
 
 // This is a hack to speedup loading of the options page on Safari.
 // Once we replaced the background page proxy with message passing
 // this global function should removed.
 function getUserFilters()
 {
   var filters = [];
   var exceptions = [];
@@ skipping 29 matching lines @@
       extractHostFromFrame(sender.frame),
       checkWhitelisted(sender.page, sender.frame,
                        RegExpFilter.typeMap.GENERICHIDE)
     );
   else
     selectors = [];
 
   return {selectors: selectors, trace: trace};
 });
 
-port.on("should-collapse", function(msg, sender)
-{
-  if (checkWhitelisted(sender.page, sender.frame))
-    return false;
-
-  var typeMask = RegExpFilter.typeMap[msg.mediatype];
-  var documentHost = extractHostFromFrame(sender.frame);
-  var sitekey = getKey(sender.page, sender.frame);
-  var blocked = false;
-
-  var specificOnly = checkWhitelisted(
-    sender.page, sender.frame,
-    RegExpFilter.typeMap.GENERICBLOCK
-  );
-
-  for (var i = 0; i < msg.urls.length; i++)
-  {
-    var url = new URL(msg.urls[i], msg.baseURL);
-    var filter = defaultMatcher.matchesAny(
-      stringifyURL(url), typeMask,
-      documentHost, isThirdParty(url, documentHost),
-      sitekey, specificOnly
-    );
-
-    if (filter instanceof BlockingFilter)
-    {
-      if (filter.collapse != null)
-        return filter.collapse;
-
-      blocked = true;
-    }
-  }
-
-  return blocked && Prefs.hidePlaceholders;
-});
-
 port.on("forward", function(msg, sender)
 {
   var targetPage;
   if (msg.targetPageId)
     targetPage = ext.getPage(msg.targetPageId);
   else
     targetPage = sender.page;
 
   if (targetPage)
   {
     msg.payload.sender = sender.page.id;
     if (msg.expectsResponse)
       return new Promise(targetPage.sendMessage.bind(targetPage, msg.payload));
     targetPage.sendMessage(msg.payload);
   }
 });