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

Bug 1597154 - pt 4. Rename SchemeUsesDocChannel r=mattwoodrow

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D59823
This commit is contained in:
Paul Bone
2020-04-01 00:33:31 +00:00
parent df3100255b
commit 9c3612e76f
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docshell/base/nsDocShell.cpp
View File

@@ -9357,7 +9357,7 @@ static bool IsConsideredSameOriginForUIR(nsIPrincipal* aTriggeringPrincipal,
// Changes here should also be made in
// E10SUtils.documentChannelPermittedForURI().
static bool SchemeUsesDocChannel(nsIURI* aURI) {
static bool URIUsesDocChannel(nsIURI* aURI) {
if (SchemeIsJavascript(aURI) || NS_IsAboutBlank(aURI)) {
return false;
}
@@ -9928,7 +9928,7 @@ nsresult nsDocShell::DoURILoad(nsDocShellLoadState* aLoadState,
bool canUseDocumentChannel =
aLoadState->HasLoadFlags(INTERNAL_LOAD_FLAGS_IS_SRCDOC)
? (sandboxFlags & SANDBOXED_ORIGIN)
: SchemeUsesDocChannel(aLoadState->URI());
: URIUsesDocChannel(aLoadState->URI());
if (StaticPrefs::browser_tabs_documentchannel() && XRE_IsContentProcess() &&
canUseDocumentChannel) {