Refactored the abstraction layer to address prerendered pages on Safari caused by leaky abstraction

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 63 matching lines @@
           };
           chrome.tabs.onUpdated.addListener(onUpdated);
         });
       }
       else
         chrome.tabs.create({url: url});
     },
     query: function(info, callback)
     {
       var rawInfo = {};
-      var visibleWindow = null;
-
       for (var property in info)
       {
         switch (property)
         {
           case "active":
           case "lastFocusedWindow":
             rawInfo[property] = info[property];
-            break;
-          case "visibleWindow":
-            visibleWindow = info[property];
-            break;
         }
       }
 
       chrome.tabs.query(rawInfo, function(tabs)
       {
-        if (visibleWindow != null && tabs.length > 0)
-        {
-          var windows = {__proto__: null};
-          var pending = 0;
-
-          for (var i = 0; i < tabs.length; i++)
-          {
-            var windowId = tabs[i].windowId;
-            if (!(windowId in windows))
-            {
-              windows[windowId] = null;
-              pending++;
-
-              chrome.windows.get(windowId, null, function(win)
-              {
-                if (visibleWindow != (win.state != "minimized"))
-                {
-                  for (var j = 0; j < tabs.length; j++)
-                  {
-                    if (tabs[j].windowId == win.id)
-                      tabs.splice(j--, 1);
-                  }
-                }
-
-                if (--pending == 0)
-                  callback(tabs.map(function(tab)
-                  {
-                    return new Page(tab);
-                  }));
-              });
-            }
-          }
-        }
-        else
-        {
-          callback(tabs.map(function(tab)
-          {
-            return new Page(tab);
-          }));
-        }
+        callback(tabs.map(function(tab)
+        {
+          return new Page(tab);
+        }));
       });
     },
     onLoading: new ext._EventTarget()
   };
 
   chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab)
   {
     if (changeInfo.status == "loading")
       ext.pages.onLoading._dispatch(new Page(tab));
   });
@@ skipping 254 matching lines @@
       page: new Page(sender.tab),
       frame: new Frame({url: sender.url, tabId: sender.tab.id})
     };
   });
 
 
   /* Storage */
 
   ext.storage = localStorage;
 })();