Issue 3636 - Make element collapsing logic consider $genericblock

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
@@ skipping 311 matching lines @@
       {
         sendResponse(false);
         break;
       }
 
       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
+          documentHost, isThirdParty(url, documentHost),
+          sitekey, specificOnly
         );
 
         if (filter instanceof BlockingFilter)
         {
           if (filter.collapse != null)
           {
             sendResponse(filter.collapse);
             return;
           }
 
@@ skipping 68 matching lines @@
   }
 });
 
 // update icon when page changes location
 ext.pages.onLoading.addListener(function(page)
 {
   page.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(page);
   showNextNotificationForUrl(page.url);
 });