Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-26 20:30:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 5ac111460188 (bug 1316256) for failure in test_ext_webrequest_basic.html. r=backout

Browse Source
This commit is contained in:
Sebastian Hengst 2016-12-07 13:52:18 +01:00
parent 7d596b4b82
commit 98798d9c07
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docshell/base/nsDocShell.cpp
View File

@ -1505,11 +1505,6 @@ nsDocShell::LoadURI(nsIURI* aURI,
principalToInherit = nsNullPrincipal::CreateWithInheritedAttributes(this);
}
// Save the triggering principal for the content policy check. If it's null,
// we don't want to use the system principal so the content policy check
// is still executed.
nsCOMPtr<nsIPrincipal> principalForContentPolicyChecks = triggeringPrincipal;
// If the triggeringPrincipal is not passed explicitly, we first try to create
// a principal from the referrer, since the referrer URI reflects the web origin
// that triggered the load. If there is no referrer URI, we fall back to using
@ -1524,9 +1519,6 @@ nsDocShell::LoadURI(nsIURI* aURI,
nsresult rv = CreatePrincipalFromReferrer(referrer,
getter_AddRefs(triggeringPrincipal));
NS_ENSURE_SUCCESS(rv, rv);
// Assign triggering principal from referrer.
principalForContentPolicyChecks = triggeringPrincipal;
}
else {
triggeringPrincipal = nsContentUtils::GetSystemPrincipal();
@ -1570,7 +1562,6 @@ nsDocShell::LoadURI(nsIURI* aURI,
referrerPolicy,
triggeringPrincipal,
principalToInherit,
principalForContentPolicyChecks,
flags,
target,
nullptr, // No type hint
@ -5369,7 +5360,6 @@ nsDocShell::LoadErrorPage(nsIURI* aURI, const char16_t* aURL,
return InternalLoad(errorPageURI, nullptr, false, nullptr,
mozilla::net::RP_Default,
nsContentUtils::GetSystemPrincipal(), nullptr,
nsContentUtils::GetSystemPrincipal(),
INTERNAL_LOAD_FLAGS_NONE, EmptyString(),
nullptr, NullString(), nullptr, nullptr, LOAD_ERROR_PAGE,
nullptr, true, NullString(), this, nullptr, nullptr,
@ -5453,7 +5443,6 @@ nsDocShell::Reload(uint32_t aReloadFlags)
mReferrerPolicy,
triggeringPrincipal,
triggeringPrincipal,
triggeringPrincipal,
flags,
EmptyString(), // No window target
NS_LossyConvertUTF16toASCII(contentTypeHint).get(),
@ -9614,7 +9603,6 @@ public:
mReferrer,
mReferrerPolicy,
mTriggeringPrincipal, mPrincipalToInherit,
mTriggeringPrincipal,
mFlags, EmptyString(), mTypeHint.get(),
NullString(), mPostData, mHeadersData,
mLoadType, mSHEntry, mFirstParty,
@ -9704,7 +9692,6 @@ nsDocShell::InternalLoad(nsIURI* aURI,
uint32_t aReferrerPolicy,
nsIPrincipal* aTriggeringPrincipal,
nsIPrincipal* aPrincipalToInherit,
nsIPrincipal* aPrincipalForContentPolicyChecks,
uint32_t aFlags,
const nsAString& aWindowTarget,
const char* aTypeHint,
@ -9861,7 +9848,7 @@ nsDocShell::InternalLoad(nsIURI* aURI,
int16_t shouldLoad = nsIContentPolicy::ACCEPT;
rv = NS_CheckContentLoadPolicy(contentType,
aURI,
aPrincipalForContentPolicyChecks,
aTriggeringPrincipal,
requestingContext,
EmptyCString(), // mime guess
nullptr, // extra
@ -10064,7 +10051,6 @@ nsDocShell::InternalLoad(nsIURI* aURI,
aReferrerPolicy,
aTriggeringPrincipal,
principalToInherit,
aPrincipalForContentPolicyChecks,
aFlags,
EmptyString(), // No window target
aTypeHint,
@ -12526,7 +12512,6 @@ nsDocShell::LoadHistoryEntry(nsISHEntry* aEntry, uint32_t aLoadType)
referrerPolicy,
triggeringPrincipal,
principalToInherit,
triggeringPrincipal,
flags,
EmptyString(), // No window target
contentType.get(), // Type hint
@ -14032,7 +14017,6 @@ nsDocShell::OnLinkClickSync(nsIContent* aContent,
aContent->NodePrincipal(), // Triggering is our node's
// principal
aContent->NodePrincipal(),
aContent->NodePrincipal(),
flags,
target, // Window target
NS_LossyConvertUTF16toASCII(typeHint).get(),

6
docshell/base/nsIDocShell.idl
View File

@ -151,11 +151,6 @@ interface nsIDocShell : nsIDocShellTreeItem
* then no inheritance of any sort will happen: the
* load will just get a principal based on the URI
* being loaded.
* @param aPrincipalForContentPolicyChecks - Principal to be passed to content policy
* check. This should match the triggering principal,
* but may be nullptr in some cases where the
* triggering principal is system but we want to
* perform a content policy check anyway.
* @param aFlags - Any of the load flags defined within above.
* @param aStopActiveDoc - Flag indicating whether loading the current
* document should be stopped.
@ -184,7 +179,6 @@ interface nsIDocShell : nsIDocShellTreeItem
in unsigned long aReferrerPolicy,
in nsIPrincipal aTriggeringPrincipal,
in nsIPrincipal aPrincipalToInherit,
in nsIPrincipal aPrincipalForContentPolicyChecks,
in uint32_t aFlags,
in AString aWindowTarget,
in string aTypeHint,