Topic 11477 - Whitelisting doesn`t deal with frames correctly

background.js

 /*
  * This file is part of the Adblock Plus extension,
  * Copyright (C) 2006-2012 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 69 matching lines @@
   if ("experimental" in localStorage)
     delete localStorage.experimental;
 }
 
 // Upgrade options before we do anything else.
 setDefaultOptions();
 
 /**
  * Checks whether a page is whitelisted.
  * @param {String} url
+ * @param {String} [parentUrl] URL of the parent frame
  * @param {String} [type] content type to be checked, default is "DOCUMENT"
  * @return {Filter} filter that matched the URL or null if not whitelisted
  */
-function isWhitelisted(url, type)
+function isWhitelisted(url, parentUrl, type)
 {
   // Ignore fragment identifier
   var index = url.indexOf("#");
   if (index >= 0)
     url = url.substring(0, index);
 
-  var result = defaultMatcher.matchesAny(url, type || "DOCUMENT", extractHostFromURL(url), false);
+  var result = defaultMatcher.matchesAny(url, type || "DOCUMENT", extractHostFromURL(parentUrl || url), false);
   return (result instanceof WhitelistFilter ? result : null);
 }
 
 // Adds or removes page action icon according to options.
 function refreshIconAndContextMenu(tab)
 {
   // The tab could have been closed by the time this function is called
   if(!tab)
     return;
 
@@ skipping 485 matching lines @@
       refreshIconAndContextMenu(windows[i].tabs[j]);
 });
 
 // Update icon if a tab changes location
 chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab)
 {
   chrome.tabs.sendRequest(tabId, {reqtype: "clickhide-deactivate"})
   if(changeInfo.status == "loading")
     refreshIconAndContextMenu(tab);
 });