Issue 6119 - Work in Progress use framAncestors in Firefox

ext/background.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 590 matching lines @@
     }
 
     // We are looking for the frame that contains the element which
     // has triggered this request. For most requests (e.g. images) we
     // can just use the request's frame ID, but for subdocument requests
     // (e.g. iframes) we must instead use the request's parent frame ID.
     let {frameId, type} = details;
     if (type == "sub_frame")
       frameId = details.parentFrameId;
 
-    let frame2 = null;
-    if (details.frameAncestors) {
-      for (let i = details.frameAncestors.length - 1; i >= 0; i--) {
-        frame2 = {id: details.frameAncestors[i].frameId,
-                  url: new URL(details.frameAncestors[i].url),
-                  parent: frame2};
-      }
-      
-      // the url here is not correct I think.
-      if (type != "sub_frame")
-        frame2 = {url: new URL(details.documentUrl), parent: frame2};
-    }
-
     // Sometimes requests are not associated with a browser tab and
     // in this case we want to still be able to view the url being called.
+    let frame = null;
     let page = null;
-    let frame = null;
     if (details.tabId != -1)
     {
-      // Only Firefox supports frameAncestors, so we have to keep the list
-      // of frames ourself.
-      if (!frame)
-        frame = ext.getFrame(details.tabId, frameId);
-
-
-      let s = (f, a = []) => {
-        a.push(f.url.toString());
-        if (f.parent)
-          return s(f.parent, a)
-        return a;
-      }
-      
-      if (s(frame).length > 0)
-        console.log(url.toString(), s(frame), s(frame2))
-
+      frame = ext.getFrame(details.tabId, frameId);
       page = new Page({id: details.tabId});
     }
 
     if (ext.webRequest.onBeforeRequest._dispatch(
         url, type, page, frame).includes(false))
       return {cancel: true};
   }, {urls: ["<all_urls>"]}, ["blocking"]);
 
 
   /* Message passing */
@@ skipping 58 matching lines @@
   ext.windows = {
     create(createData, callback)
     {
       browser.windows.create(createData, createdWindow =>
       {
         afterTabLoaded(callback)(createdWindow.tabs[0]);
       });
     }
   };
 }