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

safari/ext/background.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
@@ skipping 28 matching lines @@
 
     this.browserAction = new BrowserAction(this);
   };
   Page.prototype = {
     get url()
     {
       return this._frames[0].url;
     },
     activate: function()
     {
-      pages[this._id]._tab.activate();
+      this._tab.activate();
     },
     sendMessage: function(message, responseCallback)
     {
       this._messageProxy.sendMessage(message, responseCallback, {pageId: this._id});
     }
   };
 
   var isPageActive = function(page)
   {
     return page._tab == page._tab.browserWindow.activeTab && !page._prerendered;
@@ skipping 42 matching lines @@
 
       for (var id in pages)
       {
         var page = pages[id];
         var win = page._tab.browserWindow;
 
         if ("active" in info && info.active != isPageActive(page))
           continue;
         if ("lastFocusedWindow" in info && info.lastFocusedWindow != (win == safari.application.activeBrowserWindow))
           continue;
-        if ("visibleWindow" in info && info.visibleWindow != win.visible)
-          continue;
 
         matchedPages.push(page);
       };
 
       callback(matchedPages);
     },
     onLoading: new ext._EventTarget()
   };
 
   safari.application.addEventListener("close", function(event)
@@ skipping 49 matching lines @@
     }
   };
 
   var BrowserAction = function(page)
   {
     this._page = page;
   };
   BrowserAction.prototype = {
     _set: function(name, value)
     {
-      var currentWindow = this._page._tab.browserWindow;
-      var toolbarItem = getToolbarItemForWindow(currentWindow);
+      var toolbarItem = getToolbarItemForWindow(this._page._tab.browserWindow);
       if (!toolbarItem)
         return;
 
       var property = toolbarItemProperties[name];
       if (!property)
         property = toolbarItemProperties[name] = {
           pages: new ext.PageMap(),
           global: toolbarItem[name]
         };
 
       property.pages.set(this._page, value);
 
-      if (this._page._tab == currentWindow.activeTab && !this._page._prerendered)
+      if (isPageActive(this._page))
         toolbarItem[name] = value;
     },
     setIcon: function(path)
     {
-      this._set("image", safari.extension.baseURI + path);
+      this._set("image", safari.extension.baseURI + path.replace("$size", "16"));
     },
     setBadge: function(badge)
     {
       if (!badge)
         this._set("badge", 0);
       else if ("number" in badge)
         this._set("badge", badge.number);
     }
   };
 
@@ skipping 438 matching lines @@
         // when a prerendered page is shown, forget the previous page
         // associated with its tab, and reset the toolbar item if necessary.
         // Note that it wouldn't be sufficient to do that when the old
         // page is unloading, because Safari dispatches window.onunload
         // only when reloading the page or following links, but not when
         // the current page is replaced with a prerendered page.
         replacePage(page);
         break;
     }
   });
+
+
+  /* Storage */
+
+  ext.storage = safari.extension.settings;
 })();