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

chrome/ext/background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 28 matching lines @@
       // In that case we get the url from top frame of the tab, recorded by
       // the onBeforeRequest handler.
       var frames = framesOfTabs[this.id];
       if (frames)
       {
         var frame = frames[0];
         if (frame)
           return frame.url;
       }
     },
-    sendMessage: function(message, responseCallback)
+    sendMessage: function(message, responseCallback, frameId)
     {
-      chrome.tabs.sendMessage(this.id, message, responseCallback);
+      let options = {};
+      if (typeof frameId != "undefined")
+        options.frameId = frameId;
+      chrome.tabs.sendMessage(this.id, message, options, responseCallback);
     }
   };
 
   ext.getPage = function(id)
   {
     return new Page({id: parseInt(id, 10)});
   };
 
   function afterTabLoaded(callback)
   {
@@ skipping 259 matching lines @@
         if (!items)
           return;
 
         items.forEach(function(item)
         {
           chrome.contextMenus.create({
             title: item.title,
             contexts: item.contexts,
             onclick: function(info, tab)
             {
-              item.onclick(new Page(tab));
+              item.onclick(new Page(tab), info);
             }
           });
         });
       });
     });
   };
 
   var ContextMenus = function(page)
   {
     this._page = page;
@@ skipping 239 matching lines @@
   ext.windows = {
     create: function(createData, callback)
     {
       chrome.windows.create(createData, function(createdWindow)
       {
         afterTabLoaded(callback)(createdWindow.tabs[0]);
       });
     }
   };
 })();