corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1681510: Remove unused argument aPrincipal from CopyFavicon() in Pcontent.ipdl r=nika

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D99226
This commit is contained in:
Christoph Kerschbaumer
2020-12-10 05:53:17 +00:00
parent 74cc813e35
commit 2d6f6ae1e6
5 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
docshell/base/nsDocShell.cpp
View File

@@ -8252,14 +8252,11 @@ nsresult nsDocShell::CheckLoadingPermissions() {
//*****************************************************************************
void nsDocShell::CopyFavicon(nsIURI* aOldURI, nsIURI* aNewURI,
nsIPrincipal* aLoadingPrincipal,
bool aInPrivateBrowsing) {
if (XRE_IsContentProcess()) {
dom::ContentChild* contentChild = dom::ContentChild::GetSingleton();
if (contentChild) {
contentChild->SendCopyFavicon(aOldURI, aNewURI,
IPC::Principal(aLoadingPrincipal),
aInPrivateBrowsing);
contentChild->SendCopyFavicon(aOldURI, aNewURI, aInPrivateBrowsing);
}
return;
}
@@ -8975,8 +8972,7 @@ nsresult nsDocShell::HandleSameDocumentNavigation(
// Inform the favicon service that the favicon for oldURI also
// applies to aLoadState->URI().
CopyFavicon(currentURI, aLoadState->URI(), doc->NodePrincipal(),
UsePrivateBrowsing());
CopyFavicon(currentURI, aLoadState->URI(), UsePrivateBrowsing());
RefPtr<nsGlobalWindowOuter> scriptGlobal = mScriptGlobal;
RefPtr<nsGlobalWindowInner> win =
@@ -11273,8 +11269,7 @@ nsresult nsDocShell::UpdateURLAndHistory(Document* aDocument, nsIURI* aNewURI,
// Inform the favicon service that our old favicon applies to this new
// URI.
CopyFavicon(aCurrentURI, aNewURI, aDocument->NodePrincipal(),
UsePrivateBrowsing());
CopyFavicon(aCurrentURI, aNewURI, UsePrivateBrowsing());
} else {
FireDummyOnLocationChange();
}