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

lib/icon.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
  * 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/>.
  */
 
 /** @module icon */
 
 "use strict";
 
+let {FilterNotifier} = require("filterNotifier");
+
 const frameOpacities =  [0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9,
                          1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
                          0.9, 0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.2, 0.1, 0.0];
 const numberOfFrames = frameOpacities.length;
 const safariPlatform = require("info").platform == "safari";
 
 let stopRequested = false;
 let canUpdateIcon = true;
 let notRunning = Promise.resolve();
 let whitelistedState = new ext.PageMap();
@@ skipping 31 matching lines @@
   }
   else
   {
     chrome.browserAction.setIcon({
       tabId: page.id,
       imageData: frames["" + opacity + whitelisted]
     });
   }
 }
 
+FilterNotifier.addListener((action, page, filter) =>
+{
+  if (action == "page.WhitelistingStateRevalidate")
+  {
+    whitelistedState.set(page, !!filter);
+    if (canUpdateIcon)
+      setIcon(page);
+  }
+});
+
 function renderFrames(notificationType)
 {
   if (safariPlatform)
     return Promise.resolve(null);
 
   return Promise.all([
     loadImage("icons/abp-19.png"),
     loadImage("icons/abp-19-whitelisted.png"),
     loadImage("icons/abp-19-notification-" + notificationType + ".png"),
     loadImage("icons/abp-38.png"),
@@ skipping 65 matching lines @@
       if (animationStep > numberOfFrames)
       {
         clearInterval(interval);
         ext.pages.onActivated.removeListener(onActivated);
         canUpdateIcon = true;
       }
     }, 100);
   });
 }
 
-/**
- * Set the browser action icon for the given page, indicating whether
- * adblocking is active there, and considering the icon animation.
- *
- * @param {Page}    page         The page to set the browser action icon for
- * @param {Boolean} whitelisted  Whether the page has been whitelisted
- */
-exports.updateIcon = function(page, whitelisted)
-{
-  whitelistedState.set(page, whitelisted);
-  if (canUpdateIcon)
-    setIcon(page);
-};
-
 let stopIconAnimation =
 /**
  * Stops to animate the browser action icon
  * after the current interval has been finished.
  *
  * @return {Promise} A promise that is fullfilled when
  *                   the icon animation has been stopped.
  */
 exports.stopIconAnimation = function()
 {
@@ skipping 33 matching lines @@
           clearInterval(interval);
           resolve();
           return;
         }
 
         animateIcon(type, frames);
       }, 10000);
     });
   });
 };