Issue 3138 - Improve how context menu "block element" handles iframes

composer.postload.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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
 const {checkCollapse, elemhide,
        getURLsFromElement, typeMap} = require("./include.preload");
-const info = require("info");
 
 // The page ID for the popup filter selection dialog (top frame only).
 let blockelementPopupId = null;
 
 // Element picking state (top frame only).
 let currentlyPickingElement = false;
 let lastMouseOverEvent = null;
 
 // During element picking this is the currently highlighted element. When
 // element has been picked this is the element that is due to be blocked.
 let currentElement = null;
 
 // Highlighting state, used by the top frame during element picking and all
 // frames when the chosen element is highlighted red.
 let highlightedElementsSelector = null;
 let highlightedElementsInterval = null;
 
 // Last right click state stored for element blocking via the context menu.
 let lastRightClickEvent = null;
 let lastRightClickEventIsMostRecent = false;
 
+let perFrameMessagingSupported = false;
+browser.runtime.sendMessage(
+  {type: "app.get", what: "application"},
+  application => { perFrameMessagingSupported = application != "edge"; }
+);
 
 /* Utilities */
 
 function getFiltersForElement(element, callback)
 {
   let src = element.getAttribute("src");
   browser.runtime.sendMessage({
     type: "composer.getFilters",
     tagName: element.localName,
     id: element.id,
@@ skipping 482 matching lines @@
       case "composer.content.contextMenuClicked":
         let event = lastRightClickEvent;
         let target = event && event.target;
 
         // When the user attempts to block an element inside an iframe for which
         // our right click event listener was trashed the best we can do is to
         // offer to block the entire iframe. This doesn't work for cross origin
         // frames, neither on Edge where per-frame messaging isn't supported
         // yet[1], but it's the best we can do.
         // [1] - https://developer.microsoft.com/en-us/microsoft-edge/platform/documentation/extensions/api-support/supported-apis/
-        if (!target && window.frameElement && info.application != "edge")
+        if (!target && window.frameElement && perFrameMessagingSupported)
           target = addElementOverlay(window.frameElement);
 
         deactivateBlockElement();
         if (target)
         {
           getBlockableElementOrAncestor(target, element =>
           {
             if (element)
             {
               currentElement = element;
@@ skipping 52 matching lines @@
 if (document instanceof HTMLDocument)
 {
   // There's a bug in Firefox that causes document_end content scripts to run
   // before document_start content scripts on extension startup. In this case
   // the ext object is undefined, we fail to initialize, and initializeComposer
   // returns false. As a workaround, try again after a timeout.
   // https://bugzilla.mozilla.org/show_bug.cgi?id=1395287
   if (!initializeComposer())
     setTimeout(initializeComposer, 2000);
 }