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 11 matching lines @@
   "input": "IMAGE",
   "picture": "IMAGE",
   "audio": "MEDIA",
   "video": "MEDIA",
   "frame": "SUBDOCUMENT",
   "iframe": "SUBDOCUMENT",
   "object": "OBJECT",
   "embed": "OBJECT"
 };
 
 function getURLsFromObjectElement(element)

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

This patchsets merely moves these functions unmodifed from include.postload.js
here.

 {
   var url = element.getAttribute("data");
   if (url)
     return [url];
 
   for (var i = 0; i < element.children.length; i++)
   {
     var child = element.children[i];
     if (child.localName != "param")
       continue;
@@ skipping 46 matching lines @@
     if (child.localName == "source" || child.localName == "track")
       urls.push.apply(urls, getURLsFromAttributes(child));
   }
 
   if (element.poster)
     urls.push(element.poster);
 
   return urls;
 }
 
-function getURLsFromElement(element) {
+function getURLsFromElement(element)
+{
+  var urls;
   switch (element.localName)
   {
     case "object":
-      return getURLsFromObjectElement(element);
+      urls = getURLsFromObjectElement(element);
+      break;
 
     case "video":
     case "audio":
     case "picture":
-      return getURLsFromMediaElement(element);
-  }
-
-  return getURLsFromAttributes(element);
+      urls = getURLsFromMediaElement(element);
+      break;
+
+    default:
+      urls = getURLsFromAttributes(element);
+      break;
+  }
+
+  for (var i = 0; i < urls.length; i++)
+  {
+    if (/^(?!https?:)[\w-]+:/i.test(urls[i]))
+      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);
 }