Issue 6433 - Use generators in getURLsFromElement

include.preload.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 17 matching lines @@
   ["input", "IMAGE"],
   ["picture", "IMAGE"],
   ["audio", "MEDIA"],
   ["video", "MEDIA"],
   ["frame", "SUBDOCUMENT"],
   ["iframe", "SUBDOCUMENT"],
   ["object", "OBJECT"],
   ["embed", "OBJECT"]
 ]);
 
-function* getURLsFromObjectElement(element)
-{
-  const paramNames = [
+function* getURLsFromObjectParamChildren({children: [...children]})
+{
+  const names = [
     "movie",   // Adobe Flash
     "source",  // Silverlight
     "src",     // Real Media + Quicktime
     "FileName" // Windows Media
   ];
 
+  let param = children.find(
+    child => child.localName == "param" &&
+             names.includes(child.getAttribute("name")) &&
+             child.getAttribute("value")
+  );
+
+  if (param)
+    yield param.getAttribute("value");
+}
+
+function* getURLsFromObjectElement(element)
+{
   let data = element.getAttribute("data");
   if (data)
-  {
     yield data;
-    return;
-  }
-
-  let param = [].find.call(
-    element.children,
-    child => child.localName == "param" &&
-             paramNames.includes(child.getAttribute("name")) &&
-             child.getAttribute("value")
+  else
+    yield* getURLsFromObjectParamChildren(element);
+}
+
+function* getURLsFromMediaSourceChildren({children: [...children]})
+{
+  let sources = children.filter(
+    ({localName}) => ["source", "track"].includes(localName)
   );
 
-  if (param)
-    yield param.getAttribute("value");
-}
-
-function* getURLsFromAttributes({src = "", srcset = ""})
+  for (let source of sources)
+    yield* getURLsFromAttributes(source);
+}
+
+function* getURLsFromMediaElement(element)
+{
+  yield* getURLsFromAttributes(element);
+  yield* getURLsFromMediaSourceChildren(element);
+
+  yield element.poster;
+}
+
+function* getURLsFromAttributes({src, srcset = ""})
 {
   yield src;
 
   yield* srcset.split(",").map(url => url.trim().replace(/\s+\S+$/, ""));
-}
-
-function* getURLsFromMediaElement(element)
-{
-  yield* getURLsFromAttributes(element);
-
-  for (let child of element.children)
-  {
-    if (["source", "track"].includes(child.localName))
-      yield* getURLsFromAttributes(child);
-  }
-
-  yield element.poster;
 }
 
 function getURLsFromElement(element)
 {
   let urls = null;
 
   let {localName} = element;
 
   if (localName == "object")
     urls = getURLsFromObjectElement(element);
   else if (["video", "audio", "picture"].includes(localName))
     urls = getURLsFromMediaElement(element);
   else
     urls = getURLsFromAttributes(element);
 
-  return Array.from(urls).filter(
-    url => url && !/^(?!https?:)[\w-]+:/i.test(url)
-  );
+  return [...urls].filter(url => url && !/^(?!https?:)[\w-]+:/i.test(url));
 }
 
 function hideElement(element)
 {
   function doHide()
   {
     let propertyName = "display";
     let propertyValue = "none";
     if (element.localName == "frame")
     {
@@ skipping 398 matching lines @@
     let element = event.target;
     if (/^i?frame$/.test(element.localName))
       checkCollapse(element);
   }, true);
 }
 
 window.checkCollapse = checkCollapse;
 window.elemhide = elemhide;
 window.typeMap = typeMap;
 window.getURLsFromElement = getURLsFromElement;