Issue 4580 - Removed ext.webRequest.handlerBehaviorChanged()

lib/requestBlocker.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 238 matching lines @@
                                                "WEBRTC", docDomain,
                                                sitekey, specificOnly);
 
   logRequest([sender.page.id], url, "WEBRTC", docDomain,
              thirdParty, sitekey, specificOnly, filter);
 
   return filter instanceof BlockingFilter;
 });
 
 let ignoreFilterNotifications = false;
+let handlerBehaviorChangedQuota =
+  browser.webRequest.MAX_HANDLER_BEHAVIOR_CHANGED_CALLS_PER_10_MINUTES;
+
+function propagateHandlerBehaviorChange()
+{
+  // Make sure to not call handlerBehaviorChanged() more often than allowed
+  // by browser.webRequest.MAX_HANDLER_BEHAVIOR_CHANGED_CALLS_PER_10_MINUTES.
+  // Otherwise Chrome notifies the user that this extension is causing issues.
+  if (handlerBehaviorChangedQuota > 0)
+  {
+    browser.webNavigation.onBeforeNavigate.removeListener(
+      propagateHandlerBehaviorChange
+    );
+    browser.webRequest.handlerBehaviorChanged();
+    handlerBehaviorChangedQuota--;
+    setTimeout(() => { handlerBehaviorChangedQuota++; }, 600000);
+  }
+}
 
 function onFilterChange(arg, isDisabledAction)
 {
   // Avoid triggering filters.behaviorChanged multiple times
   // when multiple filter hanges happen at the same time.
   if (ignoreFilterNotifications)
     return;
 
   // Ignore disabled subscriptions and filters, unless they just got
   // disabled, otherwise they have no effect on the handler behavior.
   if (arg && arg.disabled && !isDisabledAction)
     return;
 
   // Ignore empty subscriptions. This includes subscriptions
   // that have just been added, but not downloaded yet.
   if (arg instanceof Subscription && arg.filters.length == 0)
     return;
 
   // Ignore all types of filters but request filters,
   // only these have an effect on the handler behavior.
   if (arg instanceof Filter && !(arg instanceof RegExpFilter))
     return;
 
   ignoreFilterNotifications = true;
   setTimeout(() =>
   {
+    // Defer handlerBehaviorChanged() until navigation occurs.
+    // There wouldn't be any visible effect when calling it earlier,
+    // but it's an expensive operation and that way we avoid to call
+    // it multiple times, if multiple filters are added/removed.
+    if (!browser.webNavigation.onBeforeNavigate
+                              .hasListener(propagateHandlerBehaviorChange))
+      browser.webNavigation.onBeforeNavigate
+                           .addListener(propagateHandlerBehaviorChange);
+
     ignoreFilterNotifications = false;
-    ext.webRequest.handlerBehaviorChanged();
     FilterNotifier.emit("filter.behaviorChanged");
   });
 }
 
 FilterNotifier.on("subscription.added", onFilterChange);
 FilterNotifier.on("subscription.removed", onFilterChange);
 FilterNotifier.on("subscription.updated", onFilterChange);
 FilterNotifier.on("subscription.disabled", arg => onFilterChange(arg, true));
 FilterNotifier.on("filter.added", onFilterChange);
 FilterNotifier.on("filter.removed", onFilterChange);
 FilterNotifier.on("filter.disabled", arg => onFilterChange(arg, true));
 FilterNotifier.on("load", onFilterChange);