Issue 4580 - Make filter/request logging use plain tabIds, prepare for multi-tab requests

lib/stats.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 35 matching lines @@
     let page = new ext.Page({id: details.tabId});
     let blocked = blockedPerPage.get(page);
 
     page.browserAction.setBadge(blocked && {
       color: badgeColor,
       number: blocked
     });
   }
 });
 
-FilterNotifier.on("filter.hitCount", (filter, newValue, oldValue, page) =>
+FilterNotifier.on("filter.hitCount", (filter, newValue, oldValue, tabIds) =>
 {
-  if (!(filter instanceof BlockingFilter) || !page)
+  if (!(filter instanceof BlockingFilter))
     return;
 
+  for (let tabId of tabIds)
+  {
+    let page = new ext.Page({id: tabId});
+    let blocked = blockedPerPage.get(page) || 0;
+    blockedPerPage.set(page, ++blocked);
+
+    // Update number in icon
+    if (Prefs.show_statsinicon)
+    {
+      page.browserAction.setBadge({
+        color: badgeColor,
+        number: blocked
+      });
+    }
+  }
+
   Prefs.blocked_total++;

[kzar, 2018/04/03 17:14:03]

Seems like before we didn't increment this counter for hits not associated with
a tab, but now we do?

[Sebastian Noack, 2018/04/04 01:50:33]

Yes. To me it seems a mistake that we didn't before. Mind that this code exists
for longer than we actually process requests that aren't associated with a tab.

-
-  let blocked = blockedPerPage.get(page) || 0;
-  blockedPerPage.set(page, ++blocked);
-
-  // Update number in icon
-  if (Prefs.show_statsinicon)
-  {
-    page.browserAction.setBadge({
-      color: badgeColor,
-      number: blocked
-    });
-  }
 });
 
 Prefs.on("show_statsinicon", () =>
 {
   browser.tabs.query({}, tabs =>
   {
     for (let tab of tabs)
     {
       let page = new ext.Page(tab);
       let badge = null;
@@ skipping 10 matching lines @@
         }
       }
 
       page.browserAction.setBadge(badge);
     }
   });
 });
 
 port.on("stats.getBlockedPerPage",
         message => getBlockedPerPage(new ext.Page(message.tab)));