[$csp3 adblockpluschrome] Issue 5241 - Avoid setting badge text before navigation is committed

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 18 matching lines @@
 
 let getBlockedPerPage =
 /**
  * Gets the number of requests blocked on the given page.
  *
  * @param  {Page} page
  * @return {Number}
  */
 exports.getBlockedPerPage = page => blockedPerPage.get(page) || 0;
 
-// Chrome automatically clears the browser action badge text when the URL of
-// the tab is updated, but Firefox doesn't.
-// https://bugzilla.mozilla.org/show_bug.cgi?id=1395074
-ext.pages.onLoading.addListener(page =>
+// Once nagivation for the tab has been committed to (e.g. it's no longer
+// being prerendered) we clear its badge, or if some requests were already
+// blocked beforehand we display those on the badge now.
+browser.webNavigation.onCommitted.addListener(details =>
 {
-  if (!blockedPerPage.get(page))
-    page.browserAction.setBadge();
+  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) =>
 {
   if (!(filter instanceof BlockingFilter) || !page)
     return;
 
   Prefs.blocked_total++;
 
   let blocked = blockedPerPage.get(page) || 0;
@@ skipping 30 matching lines @@
         }
       }
 
       page.browserAction.setBadge(badge);
     }
   });
 });
 
 port.on("stats.getBlockedPerPage",
         message => getBlockedPerPage(new ext.Page(message.tab)));
-
-// We sometimes set the badge text before Chrome considers the tab to have been
-// updated. In those cases Chrome automatically clears the text again, so the
-// blocked count will only flash for a second. To work around that we wait for
-// the navigation to be committed and then update the text again.
-browser.webNavigation.onCommitted.addListener(details =>
-{
-  let page = new ext.Page({id: details.tabId});
-  let blocked = blockedPerPage.get(page);
-
-  if (blocked)
-  {
-    page.browserAction.setBadge({
-      color: badgeColor,
-      number: blocked
-    });
-  }
-});