diff options
| -rw-r--r-- | docshell/base/nsDocShell.cpp | 3 | ||||
| -rw-r--r-- | docshell/shistory/nsSHEntry.cpp | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 5c002357f..62383bc6a 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -12663,9 +12663,6 @@ nsDocShell::LoadHistoryEntry(nsISHEntry* aEntry, uint32_t aLoadType) srcdoc = NullString(); } - // If there is no valid triggeringPrincipal, we deny the load - MOZ_ASSERT(triggeringPrincipal, - "need a valid triggeringPrincipal to load from history"); if (!triggeringPrincipal) { triggeringPrincipal = nsContentUtils::GetSystemPrincipal(); } diff --git a/docshell/shistory/nsSHEntry.cpp b/docshell/shistory/nsSHEntry.cpp index 9d8bf5096..6b0b066d9 100644 --- a/docshell/shistory/nsSHEntry.cpp +++ b/docshell/shistory/nsSHEntry.cpp @@ -518,10 +518,6 @@ nsSHEntry::GetTriggeringPrincipal(nsIPrincipal** aTriggeringPrincipal) NS_IMETHODIMP nsSHEntry::SetTriggeringPrincipal(nsIPrincipal* aTriggeringPrincipal) { - MOZ_ASSERT(aTriggeringPrincipal, "need a valid triggeringPrincipal"); - if (!aTriggeringPrincipal) { - return NS_ERROR_FAILURE; - } mShared->mTriggeringPrincipal = aTriggeringPrincipal; return NS_OK; } |