Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1316075 - Additional patch to clean up tabs and trailing whitespace in files touched. r=ehsan

Browse Source 
--HG--
extra : rebase_source : 1344bdec2d3c11dcb2b025c7bd071f110e6b99ba
extra : histedit_source : 8e697a2200117bf0db6e6728f65ffe71f88fcc5b
This commit is contained in:
Dave Huseby 2016-11-28 10:41:46 -08:00
parent 59c8485430
commit feaec25987
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docshell/base/nsDocShell.cpp
View File

@ -9564,7 +9564,7 @@ public:
InternalLoadEvent(nsDocShell* aDocShell, nsIURI* aURI,
nsIURI* aOriginalURI, bool aLoadReplace,
nsIURI* aReferrer, uint32_t aReferrerPolicy,
nsIPrincipal* aTriggeringPrincipal,
nsIPrincipal* aTriggeringPrincipal,
nsIPrincipal* aPrincipalToInherit, uint32_t aFlags,
const char* aTypeHint, nsIInputStream* aPostData,
nsIInputStream* aHeadersData, uint32_t aLoadType,
@ -9899,7 +9899,7 @@ nsDocShell::InternalLoad(nsIURI* aURI,
bool inherits;
// One more twist: Don't inherit the principal for external loads.
if (aLoadType != LOAD_NORMAL_EXTERNAL && !principalToInherit &&
(aFlags & INTERNAL_LOAD_FLAGS_INHERIT_PRINCIPAL) &&
(aFlags & INTERNAL_LOAD_FLAGS_INHERIT_PRINCIPAL) &&
NS_SUCCEEDED(nsContentUtils::URIInheritsSecurityContext(aURI,
&inherits)) &&
inherits) {
@ -10306,7 +10306,7 @@ nsDocShell::InternalLoad(nsIURI* aURI,
nsCOMPtr<nsIPrincipal> triggeringPrincipal, principalToInherit;
if (mOSHE) {
mOSHE->GetTriggeringPrincipal(getter_AddRefs(triggeringPrincipal));
mOSHE->GetPrincipalToInherit(getter_AddRefs(principalToInherit));
mOSHE->GetPrincipalToInherit(getter_AddRefs(principalToInherit));
}
// Pass true for aCloneSHChildren, since we're not
// changing documents here, so all of our subframes are

2
docshell/base/nsIDocShell.idl
View File

@ -52,7 +52,7 @@ interface nsIDocShell : nsIDocShellTreeItem
{
/**
* Loads a given URI. This will give priority to loading the requested URI
* in the object implementing this interface. If it can't be loaded here
* in the object implementing this interface. If it can't be loaded here
* however, the URL dispatcher will go through its normal process of content
* loading.
*