Bug 1490257 - Add in asserts for missing triggeringPrincipal. r=ckerschb
Depends on D10884 Differential Revision: https://phabricator.services.mozilla.com/D10885
This commit is contained in:
@@ -4101,6 +4101,9 @@ nsDocShell::LoadURI(const nsAString& aURI,
|
||||
nsIInputStream* aHeaderStream,
|
||||
nsIPrincipal* aTriggeringPrincipal)
|
||||
{
|
||||
#ifndef ANDROID
|
||||
MOZ_ASSERT(aTriggeringPrincipal, "LoadURI: Need a valid triggeringPrincipal");
|
||||
#endif
|
||||
return LoadURIWithOptions(aURI, aLoadFlags, aReferringURI,
|
||||
RP_Unset, aPostStream,
|
||||
aHeaderStream, nullptr, aTriggeringPrincipal);
|
||||
@@ -4136,6 +4139,11 @@ nsDocShell::LoadURIWithOptions(const nsAString& aURI,
|
||||
uriString.StripCRLF();
|
||||
NS_ENSURE_TRUE(!uriString.IsEmpty(), NS_ERROR_FAILURE);
|
||||
|
||||
#ifndef ANDROID
|
||||
MOZ_ASSERT(aTriggeringPrincipal, "LoadURIWithOptions: Need a valid triggeringPrincipal");
|
||||
#endif
|
||||
|
||||
|
||||
rv = NS_NewURI(getter_AddRefs(uri), uriString);
|
||||
if (uri) {
|
||||
aLoadFlags &= ~LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP;
|
||||
@@ -9031,6 +9039,9 @@ public:
|
||||
NS_IMETHOD
|
||||
Run() override
|
||||
{
|
||||
#ifndef ANDROID
|
||||
MOZ_ASSERT(mTriggeringPrincipal, "InternalLoadEvent: Should always have a principal here");
|
||||
#endif
|
||||
return mDocShell->InternalLoad(mURI, mOriginalURI, mResultPrincipalURI,
|
||||
mKeepResultPrincipalURIIfSet,
|
||||
mLoadReplace,
|
||||
@@ -13107,6 +13118,9 @@ nsDocShell::OnLinkClick(nsIContent* aContent,
|
||||
bool aIsTrusted,
|
||||
nsIPrincipal* aTriggeringPrincipal)
|
||||
{
|
||||
#ifndef ANDROID
|
||||
MOZ_ASSERT(aTriggeringPrincipal, "Need a valid triggeringPrincipal");
|
||||
#endif
|
||||
NS_ASSERTION(NS_IsMainThread(), "wrong thread");
|
||||
|
||||
if (!IsNavigationAllowed() || !IsOKToLoadURI(aURI)) {
|
||||
|
||||
Reference in New Issue
Block a user