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

webrequest.js

Index: webrequest.js
===================================================================
--- a/webrequest.js
+++ b/webrequest.js
@@ -46,6 +46,21 @@
   }
 });
 
+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))
@@ -60,16 +75,8 @@
     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);
 }