Specify real loading principal for setAndFetchFaviconForPage()

Infocatcher · Jul 7, 2016 · 6eb50f2 · 6eb50f2
1 parent f2b9394
commit 6eb50f2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/bootstrap.js b/bootstrap.js
@@ -3483,7 +3483,8 @@ var privateTab = {
 		_log("updateBookmarkFavicon()");
 		var browser = tab.linkedBrowser;
 		var _this = this;
-		function onLoaded(e) {
+		function onLoaded(e, principal) {
+			principal = principal || e && e.target.nodePrincipal;
 			e && browser.removeEventListener(e.type, onLoaded, true);
 			_dbgv && _log("updateBookmarkFavicon(): " + (e ? e.type : "already loaded"));
 			browser.ownerDocument.defaultView.setTimeout(function() { // Wait for possible changes
@@ -3502,15 +3503,15 @@ var privateTab = {
 					false /*aForceReload*/,
 					faviconService.FAVICON_LOAD_PRIVATE,
 					null /*nsIFaviconDataCallback aCallback*/,
-					null /*nsIPrincipal aLoadingPrincipal*/
+					principal /*nsIPrincipal aLoadingPrincipal*/
 				);
 			}, 0);
 		}
 		if(this.isRemoteTab(tab)) {
 			var mm = browser.messageManager;
 			var receiveMessage = function(msg) {
 				mm.removeMessageListener("PrivateTab:ContentLoaded", receiveMessage);
-				onLoaded();
+				onLoaded(null, msg.data.principal);
 			};
 			mm.addMessageListener("PrivateTab:ContentLoaded", receiveMessage);
 			mm.sendAsyncMessage("PrivateTab:Action", {
@@ -3520,7 +3521,7 @@ var privateTab = {
 		else if(browser.webProgress.isLoadingDocument)
 			browser.addEventListener("load", onLoaded, true);
 		else
-			onLoaded();
+			onLoaded(null, browser.contentPrincipal);
 	},
 	setTabState: function(tab, isPrivate) {
 		if(isPrivate === undefined) {

diff --git a/content.js b/content.js
@@ -45,12 +45,12 @@ var remoteFrameHandler = {
 			case "WaitLoading":
 				var webProgress = docShell.QueryInterface(Components.interfaces.nsIWebProgress);
 				if(!webProgress.isLoadingDocument)
-					sendAsyncMessage("PrivateTab:ContentLoaded");
+					sendAsyncMessage("PrivateTab:ContentLoaded", { principal: content.document.nodePrincipal });
 				else {
 					addEventListener("load", function onLoad(e) {
 						if(e.target == content.document) {
 							removeEventListener("load", onLoad, true);
-							sendAsyncMessage("PrivateTab:ContentLoaded");
+							sendAsyncMessage("PrivateTab:ContentLoaded", { principal: content.document.nodePrincipal });
 						}
 					}, true);
 				}