Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2019-05-17 22:18:17 +08:00
commit ec217d91d9
20 changed files with 70 additions and 789 deletions

View file

@ -833,13 +833,8 @@
}
let sizedIconUrl = browser.mIconURL || "";
if (sizedIconUrl) {
let size = Math.round(16 * window.devicePixelRatio);
sizedIconUrl += (sizedIconUrl.includes("#") ? "&" : "#") +
"-moz-resolution=" + size + "," + size;
}
if (sizedIconUrl != aTab.getAttribute("image")) {
if (browser.mIconURL)
if (sizedIconUrl)
aTab.setAttribute("image", sizedIconUrl);
else
aTab.removeAttribute("image");