Issue 5161 - Use maps and sets where appropriate

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 allPageMaps = new Set();
+  let nonEmptyPageMaps = new Set();
 
   let PageMap = ext.PageMap = function()
   {
     this._map = new Map();
-
-    allPageMaps.add(this);
   };
   PageMap.prototype = {
     _delete(id)
     {
       this._map.delete(id);
+
+      if (this._map.size == 0)
+        nonEmptyPageMaps.delete(this);
     },
     keys()
     {
       return this._map.keys();
     },
     get(page)
     {
       return this._map.get(page.id);
     },
     set(page, value)
     {
       this._map.set(page.id, value);
+      nonEmptyPageMaps.add(this);
     },
     has(page)
     {
       return this._map.has(page.id);
     },
     clear()
     {
       this._map.clear();
+      nonEmptyPageMaps.delete(this);
     },
     delete(page)
     {
       this._delete(page.id);
     }
   };
 
   ext._removeFromAllPageMaps = pageId =>
   {
-    for (let pageMap of allPageMaps)
+    for (let pageMap of nonEmptyPageMaps)
       pageMap._delete(pageId);
   };
 
   /* Pages */
 
   let Page = ext.Page = function(tab)
   {
     this.id = tab.id;
     this._url = tab.url && new URL(tab.url);
 
@@ skipping 467 matching lines @@
     tabs.forEach(tab =>
     {
       chrome.webNavigation.getAllFrames({tabId: tab.id}, details =>
       {
         if (details && details.length > 0)
         {
           let frames = new Map();
           framesOfTabs.set(tab.id, frames);
 
           for (let detail of details)
-            frames.set(detail.frameId, {url: new URL(detail.url)});
-
-          for (let detail of details)
           {
-            let {parentFrameId} = detail;
-
-            if (parentFrameId != -1)
-              frames.get(detail.frameId).parent = frames.get(parentFrameId);
+            let frame = {url: new URL(detail.url)};
+            frames.set(detail.frameId, frame);
+
+            if (detail.parentFrameId != -1)
+              frame.parent = frames.get(detail.parentFrameId);
           }
         }
       });
     });
   });
 
   chrome.webRequest.onBeforeRequest.addListener(details =>
   {
     // The high-level code isn't interested in requests that aren't
     // related to a tab or requests loading a top-level document,
     // those should never be blocked.
     if (details.tabId == -1 || details.type == "main_frame")
+      return;
+
+    // Filter out requests from non web protocols. Ideally, we'd explicitly
+    // specify the protocols we are interested in (i.e. http://, https://,
+    // ws:// and wss://) with the url patterns, given below, when adding this
+    // listener. But unfortunately, Chrome <=57 doesn't support the WebSocket
+    // protocol and is causing an error if it is given.
+    let url = new URL(details.url);
+    if (url.protocol != "http:" && url.protocol != "https:" &&
+        url.protocol != "ws:" && url.protocol != "wss:")
       return;
 
     // We are looking for the frame that contains the element which
     // has triggered this request. For most requests (e.g. images) we
     // can just use the request's frame ID, but for subdocument requests
     // (e.g. iframes) we must instead use the request's parent frame ID.
     let {frameId, type} = details;
     if (type == "sub_frame")
-    {
       frameId = details.parentFrameId;
-      type = "SUBDOCUMENT";
-    }
 
     let frame = ext.getFrame(details.tabId, frameId);
     if (frame)
     {
       let results = ext.webRequest.onBeforeRequest._dispatch(
-        new URL(details.url),
-        type.toUpperCase(),
-        new Page({id: details.tabId}),
-        frame
+        url, type, new Page({id: details.tabId}), frame
       );
 
       if (results.indexOf(false) != -1)
         return {cancel: true};
     }
   }, {urls: ["<all_urls>"]}, ["blocking"]);
 
 
   /* Message passing */
 
@@ skipping 123 matching lines @@
   ext.windows = {
     create(createData, callback)
     {
       chrome.windows.create(createData, createdWindow =>
       {
         afterTabLoaded(callback)(createdWindow.tabs[0]);
       });
     }
   };
 }());