diff options
| author | New Tobin Paradigm <email@mattatobin.com> | 2018-04-13 19:05:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-13 19:05:06 -0400 |
| commit | 60c526db500f4f0d177cd7467c0b40bc2a205c1d (patch) | |
| tree | eb7f53ae594606ca2536a40ea3f493f562f7191a /application/palemoon/components | |
| parent | 386266fab1d56b6ca116271d4670155653fa43ff (diff) | |
| parent | 7494a278ae7ec40f82979e182bf7c1c72c22b4df (diff) | |
| download | UXP-60c526db500f4f0d177cd7467c0b40bc2a205c1d.tar UXP-60c526db500f4f0d177cd7467c0b40bc2a205c1d.tar.gz UXP-60c526db500f4f0d177cd7467c0b40bc2a205c1d.tar.lz UXP-60c526db500f4f0d177cd7467c0b40bc2a205c1d.tar.xz UXP-60c526db500f4f0d177cd7467c0b40bc2a205c1d.zip | |
Merge pull request #152 from JustOff/PR_Favicons_principal
Use document's principal for favicons in browser
Diffstat (limited to 'application/palemoon/components')
| -rw-r--r-- | application/palemoon/components/feeds/FeedWriter.js | 4 | ||||
| -rw-r--r-- | application/palemoon/components/sessionstore/SessionStore.jsm | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/application/palemoon/components/feeds/FeedWriter.js b/application/palemoon/components/feeds/FeedWriter.js index 2afa35a5b..28cf582c2 100644 --- a/application/palemoon/components/feeds/FeedWriter.js +++ b/application/palemoon/components/feeds/FeedWriter.js @@ -1395,6 +1395,8 @@ FeedWriter.prototype = { .QueryInterface(Ci.nsIDocShell) .QueryInterface(Ci.nsILoadContext) .usePrivateBrowsing; + var nullPrincipal = Cc["@mozilla.org/nullprincipal;1"] + .createInstance(Ci.nsIPrincipal); this._faviconService.setAndFetchFaviconForPage(readerURI, faviconURI, false, usePrivateBrowsing ? this._faviconService.FAVICON_LOAD_PRIVATE : this._faviconService.FAVICON_LOAD_NON_PRIVATE, @@ -1409,7 +1411,7 @@ FeedWriter.prototype = { self._contentSandbox.menuItem = null; self._contentSandbox.dataURL = null; } - }); + }, nullPrincipal); }, classID: FEEDWRITER_CID, 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) |