Issue 2634 - Consider alternative URLs for element collapsing

lib/filterComposer.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 77 matching lines @@
   let frame = details.frame;
 
   if (!isFrameWhitelisted(page, frame, "DOCUMENT"))
   {
     let docDomain = extractHostFromFrame(frame);
 
     // 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);
 
-      if (urlObj.protocol == "http:" || urlObj.protocol == "https:")

[Sebastian Noack, 2015/06/07 15:30:06]

Since non-HTTP(s) URLs are excluded in the content script now, this check would
be redundant. The changes below are only indentation.

+      let filter = defaultMatcher.whitelist.matchesAny(
+        url, details.type, docDomain,
+        isThirdParty(urlObj, docDomain),
+        getKey(page, frame)
+      );
+
+      if (!filter)
       {
-        url = stringifyURL(urlObj);
+        let filterText = url.replace(/^[\w\-]+:\/+(?:www\.)?/, "||");
 
-        let filter = defaultMatcher.whitelist.matchesAny(
-          url, details.type, docDomain,
-          isThirdParty(urlObj, docDomain),
-          getKey(page, frame)
-        );
-
-        if (!filter)
-        {
-          let filterText = url.replace(/^[\w\-]+:\/+(?:www\.)?/, "||");
-
-          if (filters.indexOf(filterText) == -1)
-            filters.push(filterText);
-        }
+        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 && !isFrameWhitelisted(page, frame, "ELEMHIDE"))
     {
       // Generate CSS selectors based on the element's "id" and "class" attribute
       if (details.id)
         selectors.push("#" + escapeCSS(details.id));
@@ skipping 11 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};
 };