Issue 2034 - Respect chrome.webRequest.MAX_HANDLER_BEHAVIOR_CHANGED_CALLS_PER_10_MINUTES

webrequest.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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/>.
  */
 
 var FilterNotifier = require("filterNotifier").FilterNotifier;
+var RegExpFilter = require("filterClasses").RegExpFilter;
 var platform = require("info").platform;
 
 var importantNotifications = {
   'filter.added': true,
   'filter.removed': true,
   'filter.disabled': true,
   'subscription.added': true,
   'subscription.removed': true,
   'subscription.disabled': true,
   'subscription.updated': true,
   'load': true
 };
+
+ext.webRequest.indistinguishableTypes.forEach(function(types)
+{
+  for (var i = 1; i < types.length; i++)
+    RegExpFilter.typeMap[types[i]] = RegExpFilter.typeMap[types[0]];
+});
 
 FilterNotifier.addListener(function(action)
 {
   if (action in importantNotifications)
     ext.webRequest.handlerBehaviorChanged();
 });
 
 function onBeforeRequest(url, type, page, frame)
 {
   if (isFrameWhitelisted(page, frame))
     return true;
 
   var docDomain = extractHostFromFrame(frame);
   var key = getKey(page, frame);
   var filter = defaultMatcher.matchesAny(
     stringifyURL(url),
-    type == "sub_frame" ? "SUBDOCUMENT" : type.toUpperCase(),
-    docDomain,
+    type, docDomain,
     isThirdParty(url, docDomain),
     key
   );
 
   // We can't listen to onHeadersReceived in Safari so we need to
   // check for notifications here
-  if (platform != "chromium" && type == "sub_frame")
+  if (platform != "chromium" && type == "SUBDOCUMENT")
   {
     var notificationToShow = NotificationStorage.getNextToShow(stringifyURL(url));
     if (notificationToShow)
       showNotification(notificationToShow);
   }
 
   FilterNotifier.triggerListeners("filter.hitCount", filter, 0, 0, page);
   return !(filter instanceof BlockingFilter);
 }
 
@@ skipping 22 matching lines @@
         processKey(header.value, page, frame);
     }
 
     var notificationToShow = NotificationStorage.getNextToShow(stringifyURL(new URL(details.url)));
     if (notificationToShow)
       showNotification(notificationToShow);
   }
 
   chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["http://*/*", "https://*/*"]}, ["responseHeaders"]);
 }