Issue 616 - Enforce $generichide and $genericblock in Chrome

background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 287 matching lines @@
 {
   switch (msg.type)
   {
     case "get-selectors":
       var selectors = [];
 
       if (!isFrameWhitelisted(sender.page, sender.frame,
                               RegExpFilter.typeMap.DOCUMENT | RegExpFilter.typeMap.ELEMHIDE))
       {
         var noStyleRules = false;
+        var specificOnly = isFrameWhitelisted(sender.page, sender.frame,
+                                              RegExpFilter.typeMap.GENERICHIDE);
         var host = extractHostFromFrame(sender.frame);
+
         for (var i = 0; i < noStyleRulesHosts.length; i++)
         {
           var noStyleHost = noStyleRulesHosts[i];
           if (host == noStyleHost || (host.length > noStyleHost.length &&
                                       host.substr(host.length - noStyleHost.length - 1) == "." + noStyleHost))
           {
             noStyleRules = true;
           }
         }
-        selectors = ElemHide.getSelectorsForDomain(host, false);
+        selectors = ElemHide.getSelectorsForDomain(host, specificOnly);
         if (noStyleRules)
         {
           selectors = selectors.filter(function(s)
           {
             return !/\[style[\^\$]?=/.test(s);
           });
         }
       }
 
       sendResponse(selectors);
@@ skipping 95 matching lines @@
       break;
   }
 });
 
 // update icon when page changes location
 ext.pages.onLoading.addListener(function(page)
 {
   page.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(page);
 });