summaryrefslogtreecommitdiffstats
path: root/application/palemoon/components/sessionstore
diff options
context:
space:
mode:
authorJustOff <Off.Just.Off@gmail.com>2018-04-14 00:32:14 +0300
committerJustOff <Off.Just.Off@gmail.com>2018-04-14 00:32:14 +0300
commit7494a278ae7ec40f82979e182bf7c1c72c22b4df (patch)
tree5ba66da125af2357e836313d595b4069fc2bb026 /application/palemoon/components/sessionstore
parent501db456d4d84a9345374e9b15775f6e10883a41 (diff)
downloadUXP-7494a278ae7ec40f82979e182bf7c1c72c22b4df.tar
UXP-7494a278ae7ec40f82979e182bf7c1c72c22b4df.tar.gz
UXP-7494a278ae7ec40f82979e182bf7c1c72c22b4df.tar.lz
UXP-7494a278ae7ec40f82979e182bf7c1c72c22b4df.tar.xz
UXP-7494a278ae7ec40f82979e182bf7c1c72c22b4df.zip
Use document's principal for favicons in browser
Diffstat (limited to 'application/palemoon/components/sessionstore')
-rw-r--r--application/palemoon/components/sessionstore/SessionStore.jsm6
1 files changed, 5 insertions, 1 deletions
diff --git a/application/palemoon/components/sessionstore/SessionStore.jsm b/application/palemoon/components/sessionstore/SessionStore.jsm
index 136a3d8de..5e09ff5c8 100644
--- a/application/palemoon/components/sessionstore/SessionStore.jsm
+++ b/application/palemoon/components/sessionstore/SessionStore.jsm
@@ -3131,7 +3131,11 @@ let SessionStoreInternal = {
// Restore the tab icon.
if ("image" in tabData) {
- aWindow.gBrowser.setIcon(tab, tabData.image);
+ // Using null as the loadingPrincipal because serializing
+ // the principal would be overkill. Within SetIcon we
+ // default to the systemPrincipal if aLoadingPrincipal is
+ // null which will allow the favicon to load.
+ aWindow.gBrowser.setIcon(tab, tabData.image, null);
}
if (tabData.storage && browser.docShell instanceof Ci.nsIDocShell)