Issue 3620 - Make "Block element" generate domain specific filters when $genericblock is active

lib/filterComposer.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 78 matching lines @@
   let filters = [];
   let selectors = [];
 
   let page = details.page;
   let frame = details.frame;
 
   if (!checkWhitelisted(page, frame))
   {
     let typeMask = RegExpFilter.typeMap[details.type];
     let docDomain = extractHostFromFrame(frame);
+    let specificOnly = checkWhitelisted(page, frame, RegExpFilter.typeMap.GENERICBLOCK);

[kzar, 2016/02/03 10:29:41]

Nit: Long line

 
     // Add a blocking filter for each URL of the element that can be blocked
     for (let url of details.urls)
     {
       let urlObj = new URL(url, details.baseURL);
       url = stringifyURL(urlObj);
 
       let filter = defaultMatcher.whitelist.matchesAny(
         url, typeMask, docDomain,
         isThirdParty(urlObj, docDomain),
-        getKey(page, frame)
+        getKey(page, frame), specificOnly
       );
 
       if (!filter)
       {
         let filterText = url.replace(/^[\w\-]+:\/+(?:www\.)?/, "||");
 
+        if (specificOnly)
+          filterText += "$domain=" + docDomain;
+
         if (filters.indexOf(filterText) == -1)
           filters.push(filterText);
       }
     }
 
     // If we couldn't generate any blocking filters, fallback to element hiding
     let selectors = [];
     if (filters.length == 0 && !checkWhitelisted(page, frame, RegExpFilter.typeMap.ELEMHIDE))
     {
       // Generate CSS selectors based on the element's "id" and "class" attribute
@@ skipping 15 matching lines @@
         selectors.push(escapeCSS(details.tagName) + "[style=" + quoteCSS(details.style) + "]");
 
       // Add an element hiding filter for each generated CSS selector
       for (let selector of selectors)
         filters.push(docDomain.replace(/^www\./, "") + "##" + selector);
     }
   }
 
   return {filters: filters, selectors: selectors};
 };