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

Bug 1649879 - Fold GetFixupURIInfo into the calling code. r=kmag

Browse Source 
This should be a no-op change, just to make the next patch a small diff.

Differential Revision: https://phabricator.services.mozilla.com/D81943
This commit is contained in:
Matt Woodrow
2020-07-08 23:37:17 +00:00
parent 5dc3b798cb
commit 99495cf9ed
1 changed files with 29 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
docshell/base/nsDocShellLoadState.cpp
View File

@@ -34,46 +34,6 @@ using namespace mozilla::dom;
// Global reference to the URI fixup service.
static mozilla::StaticRefPtr<nsIURIFixup> sURIFixup;
namespace {
already_AddRefed<nsIURIFixupInfo> GetFixupURIInfo(const nsACString& aStringURI,
uint32_t aFixupFlags,
nsIInputStream** aPostData) {
nsCOMPtr<nsIURIFixupInfo> info;
if (XRE_IsContentProcess()) {
dom::ContentChild* contentChild = dom::ContentChild::GetSingleton();
if (!contentChild) {
return nullptr;
}
RefPtr<nsIInputStream> postData;
RefPtr<nsIURI> fixedURI, preferredURI;
nsAutoString providerName;
nsAutoCString stringURI(aStringURI);
// TODO (Bug 1375244): This synchronous IPC messaging should be changed.
if (contentChild->SendGetFixupURIInfo(stringURI, aFixupFlags, &providerName,
&postData, &fixedURI,
&preferredURI)) {
if (preferredURI) {
info = do_CreateInstance("@mozilla.org/docshell/uri-fixup-info;1");
if (NS_WARN_IF(!info)) {
return nullptr;
}
info->SetKeywordProviderName(providerName);
if (aPostData) {
postData.forget(aPostData);
}
info->SetFixedURI(fixedURI);
info->SetPreferredURI(preferredURI);
}
}
} else {
sURIFixup->GetFixupURIInfo(aStringURI, aFixupFlags, aPostData,
getter_AddRefs(info));
}
return info.forget();
}
} // anonymous namespace
nsDocShellLoadState::nsDocShellLoadState(nsIURI* aURI)
: nsDocShellLoadState(aURI, nsContentUtils::GenerateLoadIdentifier()) {}
@@ -271,8 +231,35 @@ nsresult nsDocShellLoadState::CreateFromLoadURIOptions(
}
nsCOMPtr<nsIInputStream> fixupStream;
fixupInfo =
GetFixupURIInfo(uriString, fixupFlags, getter_AddRefs(fixupStream));
if (XRE_IsContentProcess()) {
dom::ContentChild* contentChild = dom::ContentChild::GetSingleton();
if (contentChild) {
RefPtr<nsIInputStream> postData;
RefPtr<nsIURI> fixedURI, preferredURI;
nsAutoString providerName;
nsAutoCString stringURI(uriString);
// TODO (Bug 1375244): This synchronous IPC messaging should be changed.
if (contentChild->SendGetFixupURIInfo(stringURI, fixupFlags,
&providerName, &postData,
&fixedURI, &preferredURI)) {
if (preferredURI) {
fixupInfo =
do_CreateInstance("@mozilla.org/docshell/uri-fixup-info;1");
if (fixupInfo) {
fixupInfo->SetKeywordProviderName(providerName);
fixupStream = postData;
fixupInfo->SetFixedURI(fixedURI);
fixupInfo->SetPreferredURI(preferredURI);
}
}
}
}
} else {
sURIFixup->GetFixupURIInfo(uriString, fixupFlags,
getter_AddRefs(fixupStream),
getter_AddRefs(fixupInfo));
}
if (fixupInfo) {
// We could fix the uri, clear NS_ERROR_MALFORMED_URI.
rv = NS_OK;