Index: ext/background.js |
=================================================================== |
--- a/ext/background.js |
+++ b/ext/background.js |
@@ -322,25 +322,34 @@ |
_applyChanges() |
{ |
return Promise.all(Object.keys(this._changes).map(change => |
{ |
// Firefox for Android displays the browser action not as an icon but |
// as a menu item. There is no icon, but such an option may be added |
// in the future. |
// https://bugzilla.mozilla.org/show_bug.cgi?id=1331746 |
- if (change == "iconPath" && "setIcon" in browser.browserAction) |
+ if (change == "icon" && "setIcon" in browser.browserAction) |
{ |
+ // Use ImageData if available. |
+ if (this._changes.icon.imageData) |
+ { |
+ return browser.browserAction.setIcon({ |
+ tabId: this._tabId, |
+ imageData: this._changes.icon.imageData |
+ }); |
+ } |
+ |
let path = { |
- 16: this._changes.iconPath.replace("$size", "16"), |
- 19: this._changes.iconPath.replace("$size", "19"), |
- 20: this._changes.iconPath.replace("$size", "20"), |
- 32: this._changes.iconPath.replace("$size", "32"), |
- 38: this._changes.iconPath.replace("$size", "38"), |
- 40: this._changes.iconPath.replace("$size", "40") |
+ 16: this._changes.icon.path.replace("$size", "16"), |
+ 19: this._changes.icon.path.replace("$size", "19"), |
+ 20: this._changes.icon.path.replace("$size", "20"), |
+ 32: this._changes.icon.path.replace("$size", "32"), |
+ 38: this._changes.icon.path.replace("$size", "38"), |
+ 40: this._changes.icon.path.replace("$size", "40") |
}; |
try |
{ |
return browser.browserAction.setIcon({tabId: this._tabId, path}); |
} |
catch (e) |
{ |
// Edge throws if passed icon sizes different than 19,20,38,40px. |
@@ -394,19 +403,19 @@ |
{ |
// If the tab is prerendered, browser.browserAction.set* fails |
// and we have to delay our changes until the currently visible tab |
// is replaced with the prerendered tab. |
browser.tabs.onReplaced.addListener(onReplaced); |
}); |
} |
}, |
- setIcon(path) |
+ setIcon(path, imageData = null) |
{ |
- this._addChange("iconPath", path); |
+ this._addChange("icon", {path, imageData}); |
}, |
setBadge(badge) |
{ |
if (!badge) |
{ |
this._addChange("badgeText", ""); |
} |
else |