Fix bug 193347. r/sr=alecf. a=dbaron. Remove autocomplete learning and data collection code from nsGlobalHistory.cpp now that it is no longer needed.
This commit is contained in:
@@ -4222,7 +4222,7 @@ nsDocShell::OnStateChange(nsIWebProgress * aProgress, nsIRequest * aRequest,
|
||||
// Add the original url to global History so that
|
||||
// visited url color changes happen.
|
||||
if (uri)
|
||||
AddToGlobalHistory(channel, uri, PR_TRUE);
|
||||
AddToGlobalHistory(uri, PR_TRUE);
|
||||
} // channel
|
||||
} // aProgress
|
||||
}
|
||||
@@ -5878,7 +5878,7 @@ nsDocShell::OnNewURI(nsIURI * aURI, nsIChannel * aChannel,
|
||||
}
|
||||
|
||||
// Update Global history
|
||||
AddToGlobalHistory(aChannel, aURI, IsFrame());
|
||||
AddToGlobalHistory(aURI, IsFrame());
|
||||
}
|
||||
|
||||
// If this was a history load, update the index in
|
||||
@@ -6417,9 +6417,8 @@ NS_IMETHODIMP nsDocShell::MakeEditable(PRBool inWaitForUriLoad)
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsDocShell::AddToGlobalHistory(nsIChannel* aChannel, nsIURI * aURI, PRBool aHidden)
|
||||
nsDocShell::AddToGlobalHistory(nsIURI * aURI, PRBool aHidden)
|
||||
{
|
||||
nsresult rv;
|
||||
// first check if we should be adding it
|
||||
PRBool updateHistory;
|
||||
ShouldAddToGlobalHistory(aURI, &updateHistory);
|
||||
@@ -6432,26 +6431,6 @@ nsDocShell::AddToGlobalHistory(nsIChannel* aChannel, nsIURI * aURI, PRBool aHidd
|
||||
|
||||
NS_ENSURE_SUCCESS(mGlobalHistory->AddPage(spec.get()), NS_ERROR_FAILURE);
|
||||
|
||||
nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(aChannel, &rv));
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
nsCOMPtr<nsIURI> referrer;
|
||||
rv = httpChannel->GetReferrer(getter_AddRefs(referrer));
|
||||
if (NS_SUCCEEDED(rv) && referrer) {
|
||||
nsCAutoString referrerSpec;
|
||||
rv = referrer->GetSpec(referrerSpec);
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
nsCOMPtr<nsIBrowserHistory> browserHistory =
|
||||
do_QueryInterface(mGlobalHistory);
|
||||
// In embedding environments, the "lite" global history
|
||||
// implementation might not implement nsIBrowserHistory.
|
||||
if (browserHistory) {
|
||||
browserHistory->OutputReferrerURL(spec.get(),
|
||||
referrerSpec.get());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// this is a redirect, so hide the page from
|
||||
// being enumerated in history
|
||||
if (aHidden) {
|
||||
|
||||
Reference in New Issue
Block a user