Issue 451 - Fall back to the first known frame instead of hard-coding the top level frame

chrome/ext/background.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 295 matching lines @@
       {
         // we are looking for the frame that contains the element that
         // is about to load, however if a frame is loading the surrounding
         // frame is indicated by parentFrameId instead of frameId
         var frameId;
         if (details.type == "sub_frame")
           frameId = details.parentFrameId;
         else
           frameId = details.frameId;
 
-        frame = frames[frameId] || frames[0];
+        frame = frames[frameId] || frames[Object.keys(frames)[0]];

[Wladimir Palant, 2014/05/13 14:29:49]

Object.keys() doesn't guarantee a particular order for the properties. However,
for numerical properties both Safari and Firefox seem to return the properties
in ascending order and associating the request with a random frame won't hurt
much - so I guess changing the code here isn't worth the added complexity.

 
         if (frame && !ext.webRequest.onBeforeRequest._dispatch(details.url, details.type, new Page({id: details.tabId}), frame))
           return {cancel: true};
       }
 
       if (isMainFrame || details.type == "sub_frame")
         frames[details.frameId] = {url: details.url, parent: frame};
     }
     catch (e)
     {
@@ skipping 32 matching lines @@
     };
 
     return ext.onMessage._dispatch(message, sender, sendResponse);
   });
 
 
   /* Storage */
 
   ext.storage = localStorage;
 })();