Fixed miscellaneous issues with anti-adblock notification port

webrequest.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 platform = require("info").platform;
 
 var onFilterChangeTimeout = null;
 function onFilterChange()
 {
   onFilterChangeTimeout = null;
   ext.webRequest.handlerBehaviorChanged();
 }
 
 var importantNotifications = {
   'filter.added': true,
@@ skipping 23 matching lines @@
     return true;
 
   var docDomain = extractHostFromURL(frame.url);
   var filter = defaultMatcher.matchesAny(
     url,
     type == "sub_frame" ? "SUBDOCUMENT" : type.toUpperCase(),
     docDomain,
     isThirdParty(extractHostFromURL(url), docDomain)
   );
 
+  // We can't listen to onHeadersReceived in Safari so we need to
+  // check for notifications here
+  if (platform != "chromium" && type == "sub_frame")

[Felix Dahlke, 2014/03/28 13:10:41]

Sounds like we should check for Safari here, instead of for !Chromium. Can we?

[Thomas Greiner, 2014/03/28 15:57:08]

Should we? It's running in onHeadersReceived on "chromium" so doesn't it make
sense to have it run in onBeforeRequest for all other platforms?
To clarify that, we could also replace |platform == "chromium"| with a variable
|canUseOnHeadersReceived| and use that one instead of the platform checks.

If you disagree, I don't mind changing it to |platform == "safari"| though.

[Felix Dahlke, 2014/03/28 16:16:39]

Hm, you've got a point, alright!

+  {
+    var notificationToShow = Notification.getNextToShow(url);
+    if (notificationToShow)
+      showNotification(notificationToShow);
+  }
+
   FilterNotifier.triggerListeners("filter.hitCount", filter, 0, 0, tab);
   return !(filter instanceof BlockingFilter);
 }
 
 ext.webRequest.onBeforeRequest.addListener(onBeforeRequest);
 
-if (require("info").platform == "chromium")
+if (platform == "chromium")
 {
   function onHeadersReceived(details)
   {
     if (details.tabId == -1)
       return;
 
     if (details.type != "main_frame" && details.type != "sub_frame")
       return;
 
     var tab = new Tab({id: details.tabId});
     var frame = new Frame({id: details.frameId, tab: tab});
 
     if (frame.url != details.url)
       return;
 
     for (var i = 0; i < details.responseHeaders.length; i++)
     {
       var header = details.responseHeaders[i];
       if (header.name.toLowerCase() == "x-adblock-key" && header.value)
         processKeyException(header.value, tab, frame);
     }
 
     var notificationToShow = Notification.getNextToShow(details.url);
     if (notificationToShow)
       showNotification(notificationToShow);
   }
 
   chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["<all_urls>"]}, ["responseHeaders"]);
 }