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

Bug 1628906 - First search in a tab from location bar could trigger an "Invalid URL" error page. r=Gijs,nika,mattwoodrow

Browse Source 
Before 1496578, URIFixup::keywordToURI used to do a synchronous IPC call to be
able to access search engines from the content process. Consumers of URIFixup
didn't care. Bug 1496578 moved the IPC messaging to the callers, in particular
nsDocShell, but assumed nsDocShellLoadState wasn't loading from content.
It looks like in some cases it does, so this adds another sync IPC call for
GetFixupURIInfo.
The total numer of sync IPCs should not change from before Bug 1496578, URIFIxup
was just doing it internally, while now it happens at the call point.
Note the long term plan would be for these docshell objects callers to just
handle URIs, while the UI code should do fixup.
Bug 1375244 tracks the removal of these sync IPC messages.

Differential Revision: https://phabricator.services.mozilla.com/D70607
This commit is contained in:
Marco Bonardo
2020-04-15 22:39:38 +00:00
parent a923c367b1
commit a6761dedd6
10 changed files with 153 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
docshell/base/nsDocShellLoadState.cpp
View File

@@ -27,6 +27,46 @@
// 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)
: mURI(aURI),
mResultPrincipalURIIsSome(false),
@@ -168,9 +208,10 @@ nsresult nsDocShellLoadState::CreateFromLoadURIOptions(
nsCOMPtr<nsIURIFixupInfo> fixupInfo;
if (fixup) {
uint32_t fixupFlags;
rv = sURIFixup->WebNavigationFlagsToFixupFlags(uriString, loadFlags,
&fixupFlags);
NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
if (NS_FAILED(sURIFixup->WebNavigationFlagsToFixupFlags(
uriString, loadFlags, &fixupFlags))) {
return NS_ERROR_FAILURE;
}
// If we don't allow keyword lookups for this URL string, make sure to
// update loadFlags to indicate this as well.
@@ -189,12 +230,13 @@ nsresult nsDocShellLoadState::CreateFromLoadURIOptions(
if (loadContext && loadContext->UsePrivateBrowsing()) {
fixupFlags |= nsIURIFixup::FIXUP_FLAG_PRIVATE_CONTEXT;
}
nsCOMPtr<nsIInputStream> fixupStream;
rv = sURIFixup->GetFixupURIInfo(uriString, fixupFlags,
getter_AddRefs(fixupStream),
getter_AddRefs(fixupInfo));
if (NS_SUCCEEDED(rv)) {
nsCOMPtr<nsIInputStream> fixupStream;
fixupInfo =
GetFixupURIInfo(uriString, fixupFlags, getter_AddRefs(fixupStream));
if (fixupInfo) {
// We could fix the uri, clear NS_ERROR_MALFORMED_URI.
rv = NS_OK;
fixupInfo->GetPreferredURI(getter_AddRefs(uri));
fixupInfo->SetConsumer(aConsumer);
}