Issue 3532 - Generate animation images at runtime

lib/notificationHelper.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 notificationHelper */
 
-let {loadImage, startIconAnimation, stopIconAnimation} = require("icon");
+let {startIconAnimation, stopIconAnimation} = require("icon");
 let {Utils} = require("utils");
 let {Notification: NotificationStorage} = require("notification");
 let {stringifyURL} = require("url");
 let {initAntiAdblockNotification} = require("antiadblockInit");
 
 let activeNotification = null;
 let activeButtons = null;
 let defaultDisplayMethods = ["popup"];
 let displayMethods = Object.create(null);
 displayMethods.critical = ["icon", "notification", "popup"];
@@ skipping 114 matching lines @@
       activeNotification.onClicked();
       break;
   }
 }
 
 function notificationClosed()
 {
   activeNotification = null;
 }
 
-function imgToBase64(url, callback)
-{
-  return loadImage(url).then(function(canvas)
-  {
-    return canvas.toDataURL("image/png");

[Sebastian Noack, 2016/01/23 14:04:10]

Perhaps, we can simply get rid of this helper function now, just calling
canvas.toDataURL("image/png") below?

[kzar, 2016/01/23 14:43:14]

Done.

-  });
-}
-
 function initChromeNotifications()
 {
   // Chrome hides notifications in notification center when clicked so we need to clear them
   function clearActiveNotification(notificationId)
   {
     if (activeNotification && activeNotification.type != "question" && !("links" in activeNotification))
       return;
 
     chrome.notifications.clear(notificationId, function(wasCleared)
     {
@@ skipping 21 matching lines @@
   {
     let texts = NotificationStorage.getLocalizedTexts(notification);
     let title = texts.title || "";
     let message = texts.message ? texts.message.replace(/<\/?(a|strong)>/g, "") : "";
     let iconUrl = ext.getURL("icons/detailed/abp-128.png");
     let linkCount = (activeNotification.links || []).length;
 
     if (canUseChromeNotifications)
     {
       activeButtons = getNotificationButtons(activeNotification.type, texts.message);
-      let opts = {
+      chrome.notifications.create("", {
         type: "basic",
         title: title,
+        iconUrl: iconUrl,
         message: message,
         buttons: activeButtons.map(button => ({title: button.title})),
         priority: 2 // We use the highest priority to prevent the notification from closing automatically
-      };
-
-      imgToBase64(iconUrl).then(function(iconData)
-      {
-        opts.iconUrl = iconData;
-        chrome.notifications.create("", opts, function() {});
       });
     }
     else if ("Notification" in window && activeNotification.type != "question")
     {
       if (linkCount > 0)
         message += " " + ext.i18n.getMessage("notification_without_buttons");
 
-      imgToBase64(iconUrl).then(function(iconData)
-      {
-        let notification = new Notification(
-          title,
-          {
-            lang: Utils.appLocale,
-            dir: ext.i18n.getMessage("@@bidi_dir"),
-            body: message,
-            icon: iconData
-          }
-        );
-
-        notification.addEventListener("click", openNotificationLinks);
-        notification.addEventListener("close", notificationClosed);
-      });
+      let notification = new Notification(
+        title,
+        {
+          lang: Utils.appLocale,
+          dir: ext.i18n.getMessage("@@bidi_dir"),
+          body: message,
+          icon: iconUrl
+        }
+      );
+
+      notification.addEventListener("click", openNotificationLinks);
+      notification.addEventListener("close", notificationClosed);
     }
     else
     {
       let message = title + "\n" + message;
       if (linkCount > 0)
         message += "\n\n" + ext.i18n.getMessage("notification_with_buttons");
 
       let approved = confirm(message);
       if (activeNotification.type == "question")
         notificationButtonClick(approved ? 0 : 1);
@@ skipping 40 matching lines @@
  * specified notification type.
  * 
  * @param {string} method Display method: icon, notification or popup
  * @param {string} notificationType
  * @return {boolean}
  */
 exports.shouldDisplay = function(method, notificationType)
 {
   let methods = displayMethods[notificationType] || defaultDisplayMethods;
   return methods.indexOf(method) > -1;
-}
+};
 
 NotificationStorage.addShowListener(showNotification);