Issue 3842 - Split up the logic updating the icon and context menu

lib/whitelisting.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 31 matching lines @@
   );
 
   if (filter && devtools)
     devtools.logWhitelistedDocument(
       page, urlString, typeMask, docDomain, filter
     );
 
   return filter;
 }
 
+let checkWhitelisted =
 /**
  * Gets the active whitelisting filter for the document associated
  * with the given page/frame, or null if it's not whitelisted.
  *
  * @param {Page}   page
  * @param {Frame}  [frame]
  * @param {number} [typeMask=RegExpFilter.typeMap.DOCUMENT]
  * @return {?WhitelistFilter}
  */
 exports.checkWhitelisted = function(page, frame, typeMask)
@@ skipping 17 matching lines @@
 
     return filter;
   }
 
   return match(page, page.url, typeMask);
 };
 
 function revalidateWhitelistingState(page)
 {
   FilterNotifier.triggerListeners(
-    "page.WhitelistingStateRevalidate", page,
-    match(page, page.url, RegExpFilter.typeMap.DOCUMENT)
+    "page.WhitelistingStateRevalidate",
+    page, checkWhitelisted(page)
   );
 }
 
 let revalidating = false;
 FilterNotifier.addListener((action, arg) =>
 {
   switch (action)
   {
     case "subscription.added":
       if (arg instanceof DownloadableSubscription && !arg.lastDownload)
         break;
-    case "load":
     case "subscription.removed":
     case "subscription.disabled":
     case "subscription.updated":
     case "filter.added":
     case "filter.removed":
     case "filter.disabled":
+    case "load":
       if (!revalidating)
       {
         revalidating = true;
         ext.pages.query({}, pages =>
         {
           revalidating = false;
           for (let page of pages)
             revalidateWhitelistingState(page);
         });
       }
@@ skipping 72 matching lines @@
   key = key.replace(/=/g, "");
 
   if (verifyKey(key, signature, frame.url))
     recordKey(page, frame.url, key);
 };
 
 port.on("filters.addKey", (message, sender) =>
 {
   processKey(message.token, sender.page, sender.frame);
 });
+
+port.on("filters.isPageWhitelisted", (message, sender) =>
+{
+  return !!checkWhitelisted(sender.page);
+});