Issue 2505 - Check for notifications and dispatch filter.hitCount event asynchronously

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
@@ skipping 28 matching lines @@
     case "subscription.added":
     case "subscription.removed":
     case "subscription.disabled":
     case "subscription.updated":
     case "load":
       ext.webRequest.handlerBehaviorChanged();
       break;
   }
 });
 
+function onBeforeRequestAsync(url, type, page, filter)
+{
+  // We can't listen to onHeadersReceived in Safari so we need to
+  // check for notifications here
+  if (platform != "chromium" && type == "SUBDOCUMENT")
+  {
+    var notificationToShow = NotificationStorage.getNextToShow(stringifyURL(url));
+    if (notificationToShow)
+      showNotification(notificationToShow);
+  }
+
+  if (filter)

[Sebastian Noack, 2015/05/18 11:21:26]

Note that I added this check here, as there is no need to dispatch the event in
the first place if no filter matched.

+    FilterNotifier.triggerListeners("filter.hitCount", filter, 0, 0, page);
+}
+
 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, 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 == "SUBDOCUMENT")
-  {
-    var notificationToShow = NotificationStorage.getNextToShow(stringifyURL(url));
-    if (notificationToShow)
-      showNotification(notificationToShow);
-  }
+  setTimeout(onBeforeRequestAsync, 0, url, type, page, filter);
 
-  FilterNotifier.triggerListeners("filter.hitCount", filter, 0, 0, page);
   return !(filter instanceof BlockingFilter);
 }
 
 ext.webRequest.onBeforeRequest.addListener(onBeforeRequest);
 
 if (platform == "chromium")
 {
   function onHeadersReceived(details)
   {
     if (details.tabId == -1)
@@ skipping 15 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"]);
 }