rowan/multi-account-containers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix async favicon service issue for <55 builds. Fixes #574

Browse source
This commit is contained in:
Jonathan Kingston 2017-06-01 22:03:07 +01:00
parent 63847f4d2d
commit d931095f3d
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
index.js
View file

@ -68,6 +68,8 @@ const { viewFor } = require("sdk/view/core");
const webExtension = require("sdk/webextension"); const webExtension = require("sdk/webextension");
const windows = require("sdk/windows"); const windows = require("sdk/windows");
const windowUtils = require("sdk/window/utils"); const windowUtils = require("sdk/window/utils");
const { setTimeout } = require("sdk/timers");
Cu.import("resource:///modules/CustomizableUI.jsm"); Cu.import("resource:///modules/CustomizableUI.jsm");
Cu.import("resource:///modules/CustomizableWidgets.jsm"); Cu.import("resource:///modules/CustomizableWidgets.jsm");
@ -457,11 +459,22 @@ const ContainerService = {
}, },
async _createTabObject(tab) { async _createTabObject(tab) {
const defaultIcon = "moz-icon://goat?size=16";
let url; let url;
try { try {
url = await getFavicon(tab.url); url = await new Promise((resolve) => {
const icon = getFavicon(tab.url);
icon.then(resolve).catch(() => {
resolve(defaultIcon);
});
// This is hacky but for some reason in <55 firefox had a broken getFavicon build
// Mozregression found: https://hg.mozilla.org/integration/autoland/pushloghtml?fromchange=b01f44c896b2472b154a48c68cf343ae2289d6bd&tochange=d80c517658f5048491b7bf27da25246a297ab50b
setTimeout(() => {
resolve(defaultIcon);
}, 300);
});
} catch (e) { } catch (e) {
url = ""; url = defaultIcon;
} }
return { return {
title: tab.title, title: tab.title,