Issue 5264 - Return page objects instead of page IDs

ext/background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
 (function()
 {
   let nonEmptyPageMaps = new Set();
 
   let PageMap = ext.PageMap = function()
   {
     this._map = new Map();
   };
   PageMap.prototype = {
-    _delete(id)
+    _deleteByPageId(id)
     {
-      this._map.delete(id);
-
-      if (this._map.size == 0)
-        nonEmptyPageMaps.delete(this);
+      for (let page of this.keys().filter(page => page.id == id))
+        this.delete(page);
     },
     keys()
     {
-      return this._map.keys();
+      return Array.from(this._map.keys());
     },
     get(page)
     {
-      return this._map.get(page.id);
+      return this._map.get(page);
     },
     set(page, value)
     {
-      this._map.set(page.id, value);
+      this._map.set(page, value);
       nonEmptyPageMaps.add(this);
     },
     has(page)
     {
-      return this._map.has(page.id);
+      return this._map.has(page);
     },
     clear()
     {
       this._map.clear();
       nonEmptyPageMaps.delete(this);
     },
     delete(page)
     {
-      this._delete(page.id);
+      this._map.delete(page);
+
+      if (this._map.size == 0)
+        nonEmptyPageMaps.delete(this);
     }
   };
 
   ext._removeFromAllPageMaps = pageId =>
   {
     for (let pageMap of nonEmptyPageMaps)
-      pageMap._delete(pageId);
+      pageMap._deleteByPageId(pageId);
   };
 
   /* Pages */
 
   let Page = ext.Page = function(tab)
   {
     this.id = tab.id;
     this._url = tab.url && new URL(tab.url);
 
     this.browserAction = new BrowserAction(tab.id);
@@ skipping 652 matching lines @@
   ext.windows = {
     create(createData, callback)
     {
       chrome.windows.create(createData, createdWindow =>
       {
         afterTabLoaded(callback)(createdWindow.tabs[0]);
       });
     }
   };
 }());