Issue 2634 - Consider alternative URLs for element collapsing

include.preload.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 100 matching lines @@
       urls = getURLsFromMediaElement(element);
       break;
 
     default:
       urls = getURLsFromAttributes(element);
       break;
   }
 
   for (var i = 0; i < urls.length; i++)
   {
     if (/^(?!https?:)[\w-]+:/i.test(urls[i]))

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

Note that we already use the very same regexp in safari/ext/content.js in order
don't message the background page about absolute non-HTTP(s) URLs.

In particular in Safari sending large messages to the background page is
extremely slow (sending a ~1MB data: URL freezes Safari for several minutes).

       urls.splice(i--, 1);
   }
 
   return urls;
 }
 
 function checkCollapse(element)
 {
   var tag = element.localName;
   if (tag in typeMap)
   {
     // This element failed loading, did we block it?
-    var url = element.src;
-    if (!url || !/^https?:/i.test(url))
+    var urls = getURLsFromElement(element);
+    if (urls.length == 0)
       return;
 
     ext.backgroundPage.sendMessage(
       {
         type: "should-collapse",
-        url: url,
-        mediatype: typeMap[tag]
+        urls: urls,
+        mediatype: typeMap[tag],
+        baseURL: document.location.href
       },
 
       function(response)
       {
         if (response && element.parentNode)
         {
           var property = "display";
           var value = "none";
 
           // <frame> cannot be removed, doing that will mess up the frameset
@@ skipping 241 matching lines @@
   }, true);
 
   return updateStylesheet;
 }
 
 if (document instanceof HTMLDocument)
 {
   checkSitekey();
   window.updateStylesheet = init(document);
 }