Commit e80df6f2 authored by David Bertoni's avatar David Bertoni Committed by Commit Bot

[Extensions] Revert changes to icon loading JS function.

Bug: 1049214
Change-Id: I64018260d06070da03821bbcb72578de62359be3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2042313Reviewed-by: default avatarIstiaque Ahmed <lazyboy@chromium.org>
Commit-Queue: David Bertoni <dbertoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#739076}
parent b80f00d4
...@@ -5,32 +5,22 @@ ...@@ -5,32 +5,22 @@
var SetIconCommon = requireNative('setIcon').SetIconCommon; var SetIconCommon = requireNative('setIcon').SetIconCommon;
function loadImagePath(path, callback) { function loadImagePath(path, callback) {
let fetchPromise = fetch(path); var img = new Image();
img.onerror = function() {
let blobPromise = $Promise.then(fetchPromise, function(response) { console.error('Could not load action icon \'' + path + '\'.');
if (!response.ok) { };
throw new $Error.self('Could not load action icon \'' + path + '\'.'); img.onload = function() {
} var canvas = document.createElement('canvas');
return response.blob(); canvas.width = img.width;
}); canvas.height = img.height
let imagePromise = $Promise.then(blobPromise, function(blob) {
return createImageBitmap(blob);
});
let imageDataPromise = $Promise.then(imagePromise, function(image) {
var canvas = new OffscreenCanvas(image.width, image.height);
var canvas_context = canvas.getContext('2d'); var canvas_context = canvas.getContext('2d');
canvas_context.clearRect(0, 0, canvas.width, canvas.height); canvas_context.clearRect(0, 0, canvas.width, canvas.height);
canvas_context.drawImage(image, 0, 0, canvas.width, canvas.height); canvas_context.drawImage(img, 0, 0, canvas.width, canvas.height);
var imageData = canvas_context.getImageData(0, 0, canvas.width, var imageData = canvas_context.getImageData(0, 0, canvas.width,
canvas.height); canvas.height);
callback(imageData); callback(imageData);
}); };
img.src = path;
$Promise.catch(imageDataPromise, function(error) {
console.error(error);
});
} }
function smellsLikeImageData(imageData) { function smellsLikeImageData(imageData) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment