Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix https://github.com/uBlockOrigin/uBlock-issues/issues/32

This commit is contained in:
Raymond Hill 2018-05-08 15:01:25 -04:00
parent 89519ac7a1
commit d3691cf45a
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
platform/chromium/vapi-background.js
View File

@ -640,6 +640,9 @@ vAPI.tabs.injectScript = function(tabId, details, callback) {
// Firefox for Android does no support browser.browserAction.setIcon(). // Firefox for Android does no support browser.browserAction.setIcon().
// Performance: use ImageData for platforms supporting it. // Performance: use ImageData for platforms supporting it.
// https://github.com/uBlockOrigin/uBlock-issues/issues/32
// Ensure ImageData for toolbar icon is valid before use.
vAPI.setIcon = (function() { vAPI.setIcon = (function() {
let browserAction = chrome.browserAction, let browserAction = chrome.browserAction,
titleTemplate = chrome.runtime.getManifest().name + ' ({badge})'; titleTemplate = chrome.runtime.getManifest().name + ' ({badge})';
@ -686,7 +689,18 @@ vAPI.setIcon = (function() {
ctx.clearRect(0, 0, w, h); ctx.clearRect(0, 0, w, h);
ctx.drawImage(img.r, 0, 0); ctx.drawImage(img.r, 0, 0);
if ( iconData[img.i] === null ) { iconData[img.i] = {}; } if ( iconData[img.i] === null ) { iconData[img.i] = {}; }
iconData[img.i][img.p] = ctx.getImageData(0, 0, w, h); let imgData = ctx.getImageData(0, 0, w, h);
if (
imgData instanceof Object === false ||
imgData.data instanceof Uint8ClampedArray === false ||
imgData.data[0] !== 0 ||
imgData.data[1] !== 0 ||
imgData.data[2] !== 0 ||
imgData.data[3] !== 0
) {
return;
}
iconData[img.i][img.p] = imgData;
} }
icons[0] = { tabId: 0, imageData: iconData[0] }; icons[0] = { tabId: 0, imageData: iconData[0] };
icons[1] = { tabId: 0, imageData: iconData[1] }; icons[1] = { tabId: 0, imageData: iconData[1] };