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

Bug 1649879 - Don't create nsIURIFixupInfo in content process nsDocShellLoadState construction. r=kmag

Browse Source 
Rather than constructing an nsIURIFixupInfo from the IPC call return valuess, and then immediately querying the same data, this just use the results directly.

It also moves the firing of "keyword-uri-fixup" observers to the parent process side. As far as I can tell, the only consumer was URIFixupChild, which was also forwarding them to the parent process.

Differential Revision: https://phabricator.services.mozilla.com/D81944
This commit is contained in:
Matt Woodrow
2020-07-08 23:37:29 +00:00
parent 99495cf9ed
commit e34e9db40c
4 changed files with 55 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
docshell/base/nsDocShellLoadState.cpp
View File

@@ -212,7 +212,8 @@ nsresult nsDocShellLoadState::CreateFromLoadURIOptions(
}
}
nsCOMPtr<nsIURIFixupInfo> fixupInfo;
nsAutoString searchProvider, keyword;
bool didFixup = false;
if (fixup) {
uint32_t fixupFlags;
if (NS_FAILED(sURIFixup->WebNavigationFlagsToFixupFlags(
@@ -230,41 +231,47 @@ nsresult nsDocShellLoadState::CreateFromLoadURIOptions(
fixupFlags |= nsIURIFixup::FIXUP_FLAG_PRIVATE_CONTEXT;
}
nsCOMPtr<nsIInputStream> fixupStream;
RefPtr<nsIInputStream> fixupStream;
if (XRE_IsContentProcess()) {
dom::ContentChild* contentChild = dom::ContentChild::GetSingleton();
if (contentChild) {
RefPtr<nsIInputStream> postData;
RefPtr<nsIURI> fixedURI, preferredURI;
nsAutoString providerName;
nsAutoCString stringURI(uriString);
RefPtr<nsIURI> preferredURI;
// TODO (Bug 1375244): This synchronous IPC messaging should be changed.
if (contentChild->SendGetFixupURIInfo(stringURI, fixupFlags,
&providerName, &postData,
&fixedURI, &preferredURI)) {
if (contentChild->SendGetFixupURIInfo(
PromiseFlatString(aURI), fixupFlags,
loadFlags &
nsIWebNavigation::LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP,
&searchProvider, &fixupStream, &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);
}
didFixup = true;
rv = NS_OK;
uri = preferredURI;
}
}
}
} else {
nsCOMPtr<nsIURIFixupInfo> fixupInfo;
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;
fixupInfo->GetPreferredURI(getter_AddRefs(uri));
fixupInfo->SetConsumer(aBrowsingContext);
fixupInfo->GetKeywordProviderName(searchProvider);
fixupInfo->GetKeywordAsSent(keyword);
didFixup = true;
if (fixupInfo) {
// We could fix the uri, clear NS_ERROR_MALFORMED_URI.
rv = NS_OK;
fixupInfo->GetPreferredURI(getter_AddRefs(uri));
fixupInfo->SetConsumer(aBrowsingContext);
if (fixupInfo &&
loadFlags & nsIWebNavigation::LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP) {
nsCOMPtr<nsIObserverService> serv = services::GetObserverService();
if (serv) {
serv->NotifyObservers(fixupInfo, "keyword-uri-fixup",
PromiseFlatString(aURI).get());
}
}
}
}
if (fixupStream) {
@@ -273,15 +280,6 @@ nsresult nsDocShellLoadState::CreateFromLoadURIOptions(
// passed-in post data.
postData = fixupStream;
}
if (fixupInfo &&
loadFlags & nsIWebNavigation::LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP) {
nsCOMPtr<nsIObserverService> serv = services::GetObserverService();
if (serv) {
serv->NotifyObservers(fixupInfo, "keyword-uri-fixup",
PromiseFlatString(aURI).get());
}
}
}
if (rv == NS_ERROR_MALFORMED_URI) {
@@ -348,10 +346,7 @@ nsresult nsDocShellLoadState::CreateFromLoadURIOptions(
loadState->SetCancelContentJSEpoch(aLoadURIOptions.mCancelContentJSEpoch);
}
if (fixupInfo) {
nsAutoString searchProvider, keyword;
fixupInfo->GetKeywordProviderName(searchProvider);
fixupInfo->GetKeywordAsSent(keyword);
if (didFixup) {
nsDocShell::MaybeNotifyKeywordSearchLoading(searchProvider, keyword);
}