Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: lib/icon.js

Issue 29995555: Issue 7253 - Pre-render icons for badge on Chromium (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/
Patch Set: Restrict to Chromium Created Feb. 2, 2019, 11:51 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ext/background.js ('K') | « ext/background.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/icon.js
===================================================================
--- a/lib/icon.js
+++ b/lib/icon.js
@@ -15,27 +15,30 @@
* along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
*/
/** @module icon */
"use strict";
const {filterNotifier} = require("../adblockpluscore/lib/filterNotifier");
+const info = require("info");
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;
let stopRequested = false;
let canUpdateIcon = true;
let notRunning = Promise.resolve();
let whitelistedState = new ext.PageMap();
+let icons = [null, null];
+
function loadImage(url)
{
return new Promise((resolve, reject) =>
{
let image = new Image();
image.src = url;
image.addEventListener("load", () =>
{
@@ -43,32 +46,82 @@
});
image.addEventListener("error", () =>
{
reject("Failed to load image " + url);
});
});
}
+function renderIcons()
+{
+ Promise.all([
+ loadImage("icons/abp-16.png"),
+ loadImage("icons/abp-16-whitelisted.png"),
+ loadImage("icons/abp-19.png"),
+ loadImage("icons/abp-19-whitelisted.png"),
+ loadImage("icons/abp-20.png"),
+ loadImage("icons/abp-20-whitelisted.png"),
+ loadImage("icons/abp-32.png"),
+ loadImage("icons/abp-32-whitelisted.png"),
+ loadImage("icons/abp-38.png"),
+ loadImage("icons/abp-38-whitelisted.png"),
+ loadImage("icons/abp-40.png"),
+ loadImage("icons/abp-40-whitelisted.png"),
Sebastian Noack 2019/02/03 06:43:18 The icons in the sizes 20 and 40 are only used on
Manish Jethani 2019/02/03 07:26:49 Done.
Sebastian Noack 2019/02/03 07:45:15 I'm certain that it will work on Chrome 49. But Ch
Manish Jethani 2019/02/03 08:00:02 Alright, let's test have QA test it out on Chrome
+ ])
+ .then(images =>
+ {
+ let imageMap = {
+ 16: [images[0], images[1]],
+ 19: [images[2], images[3]],
+ 20: [images[4], images[5]],
+ 32: [images[6], images[7]],
+ 38: [images[8], images[9]],
+ 40: [images[10], images[11]]
+ };
+
+ let canvas = document.createElement("canvas");
+ let context = canvas.getContext("2d");
+
+ for (let whitelisted of [false, true])
+ {
+ let imageData = {};
+ let sizes = [16, 19, 20, 32, 38, 40];
+
+ for (let size of sizes)
+ {
+ canvas.width = size;
+ canvas.height = size;
+ context.globalAlpha = 1;
+ context.drawImage(imageMap[size][whitelisted | 0], 0, 0);
+ imageData[size] = context.getImageData(0, 0, size, size);
+ }
+
+ icons[whitelisted | 0] = imageData;
+ }
+ });
+}
+
function setIcon(page, notificationType, opacity, frames)
{
opacity = opacity || 0;
let whitelisted = !!whitelistedState.get(page);
if (!notificationType || !frames)
{
if (opacity > 0.5)
{
page.browserAction.setIcon("/icons/abp-$size-notification-" +
notificationType + ".png");
}
else
{
page.browserAction.setIcon("/icons/abp-$size" +
- (whitelisted ? "-whitelisted" : "") + ".png");
+ (whitelisted ? "-whitelisted" : "") + ".png",
+ icons[whitelisted | 0]);
}
}
else
{
browser.browserAction.setIcon({
tabId: page.id,
imageData: frames["" + opacity + whitelisted]
});
@@ -232,8 +285,12 @@
return;
}
animateIcon(type, frames);
}, 10000);
});
});
};
+
+// Pre-render icons on Chromium (#7253).
+if (info.platform == "chromium")
+ renderIcons();
« ext/background.js ('K') | « ext/background.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld