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

Backed out changeset 8d7987ea4fb1 (bug 1490257) for causing android failures. CLOSED TREE

Browse Source
This commit is contained in:
Dorel Luca
2018-10-15 14:39:00 +03:00
parent 06c83463b9
commit a5b6424b63
33 changed files with 56 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docshell/base/nsDocShell.cpp
View File

@@ -946,8 +946,7 @@ nsDocShell::LoadURI(nsIURI* aURI,
NS_ENSURE_SUCCESS(rv, rv);
}
else {
MOZ_ASSERT(false, "LoadURI: System principal required.");
triggeringPrincipal = nsContentUtils::GetSystemPrincipal();
triggeringPrincipal = nsContentUtils::GetSystemPrincipal();
}
}
@@ -4206,7 +4205,6 @@ nsDocShell::LoadURI(const nsAString& aURI,
nsIInputStream* aHeaderStream,
nsIPrincipal* aTriggeringPrincipal)
{
MOZ_ASSERT(aTriggeringPrincipal, "LoadURI: Need a valid triggeringPrincipal");
return LoadURIWithOptions(aURI, aLoadFlags, aReferringURI,
RP_Unset, aPostStream,
aHeaderStream, nullptr, aTriggeringPrincipal);
@@ -4242,9 +4240,6 @@ nsDocShell::LoadURIWithOptions(const nsAString& aURI,
uriString.StripCRLF();
NS_ENSURE_TRUE(!uriString.IsEmpty(), NS_ERROR_FAILURE);
MOZ_ASSERT(aTriggeringPrincipal, "LoadURIWithOptions: Need a valid triggeringPrincipal");
rv = NS_NewURI(getter_AddRefs(uri), uriString);
if (uri) {
aLoadFlags &= ~LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP;
@@ -9137,7 +9132,6 @@ public:
, mSourceDocShell(aSourceDocShell)
, mBaseURI(aBaseURI)
{
MOZ_ASSERT(mTriggeringPrincipal, "InternalLoadEvent: Should always have a principal here");
// Make sure to keep null things null as needed
if (aTypeHint) {
mTypeHint = aTypeHint;
@@ -13227,7 +13221,6 @@ nsDocShell::OnLinkClick(nsIContent* aContent,
bool aIsTrusted,
nsIPrincipal* aTriggeringPrincipal)
{
MOZ_ASSERT(aTriggeringPrincipal, "Need a valid triggeringPrincipal");
NS_ASSERTION(NS_IsMainThread(), "wrong thread");
if (!IsNavigationAllowed() || !IsOKToLoadURI(aURI)) {