Align whitelisting behavior in Chrome with Firefox

webrequest.js

 /*
  * This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/.
  */
 
 chrome.webRequest.onBeforeRequest.addListener(onBeforeRequest, {urls: ["http://*/*", "https://*/*"]}, ["blocking"]);
 chrome.webRequest.onBeforeSendHeaders.addListener(onBeforeSendHeaders, {urls: ["http://*/*", "https://*/*"]}, ["requestHeaders", "blocking"]);
 chrome.tabs.onRemoved.addListener(forgetTab);
 
 var frames = {};
 
 function onBeforeRequest(details)
 {
   if (details.tabId == -1)
     return {};
 
   var type = details.type;
   if (type == "main_frame" || type == "sub_frame")
-    recordFrame(details.tabId, details.frameId, details.parentFrameId, details.url, type == "main_frame");

[Felix Dahlke, 2012/09/18 13:23:14]

type == "main_frame" is redundant here, I'd assign the result to a variable once
and use that.

+    recordFrame(details.tabId, details.frameId, details.parentFrameId, details.url);
 
   if (type == "main_frame")
     return {};
 
   // Type names match Mozilla's with main_frame and sub_frame being the only exceptions.
   if (type == "sub_frame")
     type = "SUBDOCUMENT";
   else
     type = type.toUpperCase();
 
@@ skipping 23 matching lines @@
     var headers = details.requestHeaders || [];
     if (!headers.some(function(header) { header.name == "DNT";}))
     {
       headers.push({name: "DNT", value: "1"});
       return {requestHeaders: headers};
     }
   }
   return null;
 }
 
-function recordFrame(tabId, frameId, parentFrameId, frameUrl, isMain)

[Felix Dahlke, 2012/09/18 13:23:14]

This parameter is no longer used, it could be removed from the signature.

+function recordFrame(tabId, frameId, parentFrameId, frameUrl)
 {
   if (!(tabId in frames))
     frames[tabId] = {};
   frames[tabId][frameId] = {url: frameUrl, parent: parentFrameId};
 }
 
 function getFrameUrl(tabId, frameId)
 {
   if (tabId in frames && frameId in frames[tabId])
     return frames[tabId][frameId].url;
@@ skipping 32 matching lines @@
   var parent = frameId;
   while (parent != -1)
   {
     var parentUrl = getFrameUrl(tabId, parent);
     if (parentUrl && isWhitelisted(parentUrl, type))
       return true;
     parent = getFrameParent(tabId, parent);
   }
   return false;
 }