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

Bug 1588298 - Ensure CreateFromLoadURIOptions passes the appropriate PRIVATE flag to URIFixup. r=kmag

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D49154
This commit is contained in:
Marco Bonardo
2019-10-15 08:11:45 +00:00
parent 20970b00a0
commit 455981924c
2 changed files with 79 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
docshell/base/nsDocShellLoadState.cpp
View File

@@ -142,7 +142,18 @@ nsresult nsDocShellLoadState::CreateFromLoadURIOptions(
if (!(fixupFlags & nsIURIFixup::FIXUP_FLAG_ALLOW_KEYWORD_LOOKUP)) {
loadFlags &= ~nsIWebNavigation::LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP;
}
// The consumer is either a DocShell or an Element.
nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(aConsumer);
if (!loadContext) {
if (RefPtr<Element> element = do_QueryObject(aConsumer)) {
loadContext = do_QueryInterface(element->OwnerDoc()->GetDocShell());
}
}
// Ensure URIFixup will use the right search engine in Private Browsing.
MOZ_ASSERT(loadContext, "We should always have a LoadContext here.");
if (loadContext && loadContext->UsePrivateBrowsing()) {
fixupFlags |= nsIURIFixup::FIXUP_FLAG_PRIVATE_CONTEXT;
}
nsCOMPtr<nsIInputStream> fixupStream;
rv = aURIFixup->GetFixupURIInfo(uriString, fixupFlags,
getter_AddRefs(fixupStream),