Issue 6954 - Fixed whitelisting checks skipping immediate parent document

lib/whitelisting.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 47 matching lines @@
  * @param {number} [typeMask=RegExpFilter.typeMap.DOCUMENT]
  * @return {?WhitelistFilter}
  */
 exports.checkWhitelisted = (page, frame, originUrl,
                             typeMask = RegExpFilter.typeMap.DOCUMENT) =>
 {
   if (frame || originUrl)
   {
     while (frame)
     {
-      let parentFrame = frame.parent;
       let filter = match(page, frame.url, typeMask,
-                         extractHostFromFrame(parentFrame, originUrl),
+                         extractHostFromFrame(frame, originUrl),
                          getKey(page, frame, originUrl));
 
       if (filter)
         return filter;
 
-      frame = parentFrame;
+      frame = frame.parent;
     }
 
     return originUrl && match(page, originUrl, typeMask, null,
                               getKey(null, null, originUrl));
   }
 
   return page && match(page, page.url, typeMask);
 };
 
 port.on("filters.isWhitelisted", message =>
@@ skipping 147 matching lines @@
 {
   browser.webRequest.onHeadersReceived.addListener(
     onHeadersReceived,
     {
       urls: ["http://*/*", "https://*/*"],
       types: ["main_frame", "sub_frame"]
     },
     ["responseHeaders"]
   );
 }