Issue 4218 - Browser icons for newer Chrome + Edge

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
@@ skipping 67 matching lines @@
   if (canUpdateIcon)
     setIcon(page);
 });
 
 function renderFrames(notificationType)
 {
   if (safariPlatform)
     return Promise.resolve(null);
 
   return Promise.all([
+    loadImage("icons/abp-16.png"),
+    loadImage("icons/abp-16-whitelisted.png"),
+    loadImage("icons/abp-16-notification-" + notificationType + ".png"),
     loadImage("icons/abp-19.png"),
     loadImage("icons/abp-19-whitelisted.png"),
     loadImage("icons/abp-19-notification-" + notificationType + ".png"),
+    loadImage("icons/abp-20.png"),
+    loadImage("icons/abp-20-whitelisted.png"),
+    loadImage("icons/abp-20-notification-" + notificationType + ".png"),
+    loadImage("icons/abp-32.png"),
+    loadImage("icons/abp-32-whitelisted.png"),
+    loadImage("icons/abp-32-notification-" + notificationType + ".png"),
     loadImage("icons/abp-38.png"),
     loadImage("icons/abp-38-whitelisted.png"),
     loadImage("icons/abp-38-notification-" + notificationType + ".png"),
+    loadImage("icons/abp-40.png"),
+    loadImage("icons/abp-40-whitelisted.png"),
+    loadImage("icons/abp-40-notification-" + notificationType + ".png")
   ]).then(images =>
   {
     let images = {
-      19: { base: [images[0], images[1]], overlay: images[2] },
-      38: { base: [images[3], images[4]], overlay: images[5] }
+      16: { base: [images[0], images[1]], overlay: images[2] },
+      19: { base: [images[3], images[4]], overlay: images[5] },
+      20: { base: [images[6], images[7]], overlay: images[8] },
+      32: { base: [images[9], images[10]], overlay: images[11] },
+      38: { base: [images[12], images[13]], overlay: images[14] },
+      40: { base: [images[15], images[16]], overlay: images[17] }
     };
 
     let frames = {};
     let canvas = document.createElement("canvas");
     let context = canvas.getContext("2d");
 
     for (let whitelisted of [false, true])
     {
       for (let i = 0, opacity = 0; i <= 10; opacity = ++i / 10)
       {
         let imageData = {};
-        for (let size of [19, 38])
+        for (let size of [16, 19, 20, 32, 38, 40])

[Sebastian Noack, 2016/08/09 13:46:47]

As mentioned before, please don't use for..of with array literals in code
processed by jsHydra. jsHydra being quite simple, it will generate following
ugly (and potentially slow) code. Use a variable instead.
 
  for (var _loopIndex13 = 0; _loopIndex13 < [16, 19, 20, 32, 38, 40].length;
++_loopIndex13)
  {
    var size = [16, 19, 20, 32, 38, 40][_loopIndex13];
    ...

Yes, this seems to be unrelated to your changes here, but since you made the
array even longer it makes it worse.

         {
           canvas.width = size;
           canvas.height = size;
           context.globalAlpha = 1;
           context.drawImage(images[size]["base"][whitelisted | 0], 0, 0);
           context.globalAlpha = opacity;
           context.drawImage(images[size]["overlay"], 0, 0);
           imageData[size] = context.getImageData(0, 0, size, size);
         }
         frames["" + opacity + whitelisted] = imageData;
@@ skipping 89 matching lines @@
           clearInterval(interval);
           resolve();
           return;
         }
 
         animateIcon(type, frames);
       }, 10000);
     });
   });
 };