зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1681510: Remove unused argument aPrincipal from CopyFavicon() in Pcontent.ipdl r=nika
Differential Revision: https://phabricator.services.mozilla.com/D99226
This commit is contained in:
Родитель
4415bec7a4
Коммит
92319b0661
|
@ -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();
|
||||
}
|
||||
|
|
|
@ -362,7 +362,6 @@ class nsDocShell final : public nsDocLoader,
|
|||
|
||||
// Tell the favicon service that aNewURI has the same favicon as aOldURI.
|
||||
static void CopyFavicon(nsIURI* aOldURI, nsIURI* aNewURI,
|
||||
nsIPrincipal* aLoadingPrincipal,
|
||||
bool aInPrivateBrowsing);
|
||||
|
||||
static nsDocShell* Cast(nsIDocShell* aDocShell) {
|
||||
|
|
|
@ -4638,8 +4638,7 @@ nsresult ContentParent::DoSendAsyncMessage(const nsAString& aMessage,
|
|||
}
|
||||
|
||||
mozilla::ipc::IPCResult ContentParent::RecvCopyFavicon(
|
||||
nsIURI* aOldURI, nsIURI* aNewURI, const IPC::Principal& aLoadingPrincipal,
|
||||
const bool& aInPrivateBrowsing) {
|
||||
nsIURI* aOldURI, nsIURI* aNewURI, const bool& aInPrivateBrowsing) {
|
||||
if (!aOldURI) {
|
||||
return IPC_FAIL(this, "aOldURI should not be null");
|
||||
}
|
||||
|
@ -4647,8 +4646,7 @@ mozilla::ipc::IPCResult ContentParent::RecvCopyFavicon(
|
|||
return IPC_FAIL(this, "aNewURI should not be null");
|
||||
}
|
||||
|
||||
nsDocShell::CopyFavicon(aOldURI, aNewURI, aLoadingPrincipal,
|
||||
aInPrivateBrowsing);
|
||||
nsDocShell::CopyFavicon(aOldURI, aNewURI, aInPrivateBrowsing);
|
||||
return IPC_OK();
|
||||
}
|
||||
|
||||
|
|
|
@ -1134,8 +1134,7 @@ class ContentParent final
|
|||
|
||||
mozilla::ipc::IPCResult RecvDeviceReset();
|
||||
|
||||
mozilla::ipc::IPCResult RecvCopyFavicon(
|
||||
nsIURI* aOldURI, nsIURI* aNewURI, const IPC::Principal& aLoadingPrincipal,
|
||||
mozilla::ipc::IPCResult RecvCopyFavicon(nsIURI* aOldURI, nsIURI* aNewURI,
|
||||
const bool& aInPrivateBrowsing);
|
||||
|
||||
virtual void ProcessingError(Result aCode, const char* aMsgName) override;
|
||||
|
|
|
@ -1161,7 +1161,7 @@ parent:
|
|||
|
||||
async DeviceReset();
|
||||
|
||||
async CopyFavicon(nsIURI oldURI, nsIURI newURI, Principal aLoadingPrincipal, bool isPrivate);
|
||||
async CopyFavicon(nsIURI oldURI, nsIURI newURI, bool isPrivate);
|
||||
|
||||
/**
|
||||
* Notifies the parent about a recording device is starting or shutdown.
|
||||
|
|
Загрузка…
Ссылка в новой задаче