Issue 6543 - Match requests without tabId/frameId in their originating context

lib/url.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 27 matching lines @@
     return hostname;
 
   return punycode.toUnicode(hostname);
 };
 
 /**
  * Gets the IDN-decoded hostname from the URL of a frame.
  * If the URL don't have host information (like "about:blank"
  * and "data:" URLs) it falls back to the parent frame.
  *
- * @param {Frame} frame
+ * @param {?Frame}  frame
+ * @param {URL}    [originUrl]
  * @return {string}
  */
-exports.extractHostFromFrame = frame =>
+exports.extractHostFromFrame = (frame, originUrl) =>
 {
   for (; frame; frame = frame.parent)
   {
     let hostname = getDecodedHostname(frame.url);
     if (hostname)
       return hostname;
   }
 
-  return "";
+  return originUrl ? getDecodedHostname(originUrl) : "";
 };
 
 /**
  * Converts a URL object into a string. For HTTP(S) URLs
  * the hostname gets IDN-decoded and the hash is stripped.
  *
  * @param {URL} url
  * @return {string}
  */
 exports.stringifyURL = url =>
@@ skipping 38 matching lines @@
   documentHost = documentHost.replace(/\.+$/, "");
 
   if (requestHost == documentHost)
     return false;
 
   if (!isDomain(requestHost) || !isDomain(documentHost))
     return true;
 
   return getDomain(requestHost) != getDomain(documentHost);
 };