bug 310696 suppress "view-source:" scheme in title, r=mconnor, sr=neil.parkwaycc

git-svn-id: svn://10.0.0.236/trunk@182282 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dveditz%cruzio.com 2005-10-14 23:33:51 +00:00
parent dc95c7a23c
commit 3e47562881
3 changed files with 14 additions and 9 deletions

View File

@ -583,12 +583,13 @@
// If location bar is hidden and the URL type supports a host,
// add the scheme and host to the title to prevent spoofing.
// XXX https://bugzilla.mozilla.org/show_bug.cgi?id=22183#c239
// (only for schemes that support a host)
try {
if (docElement.getAttribute("chromehidden").indexOf("location") != -1) {
var host = this.mURIFixup.createExposableURI(
this.mCurrentBrowser.currentURI).prePath;
if (host)
newTitle = host + sep + newTitle;
var uri = this.mURIFixup.createExposableURI(
this.mCurrentBrowser.currentURI);
if (uri.host)
newTitle = uri.prePath + sep + newTitle;
}
} catch (e) {}

View File

@ -639,9 +639,12 @@ NS_IMETHODIMP nsContentTreeOwner::SetTitle(const PRUnichar* aTitle)
nsCOMPtr<nsIURI> tmpuri;
nsresult rv = fixup->CreateExposableURI(uri,getter_AddRefs(tmpuri));
if (NS_SUCCEEDED(rv) && tmpuri) {
// (don't bother if there's no host)
nsCAutoString host;
nsCAutoString prepath;
tmpuri->GetHost(host);
tmpuri->GetPrePath(prepath);
if (!prepath.IsEmpty()) {
if (!host.IsEmpty()) {
//
// We have a scheme/host, update the title
//

View File

@ -511,12 +511,13 @@
// If location bar is hidden and the URL type supports a host,
// add the scheme and host to the title to prevent spoofing.
// XXX https://bugzilla.mozilla.org/show_bug.cgi?id=22183#c239
// (only for schemes that support a host)
try {
if (docElement.getAttribute("chromehidden").indexOf("location") != -1) {
var host = this.mURIFixup.createExposableURI(
this.mCurrentBrowser.currentURI).prePath;
if (host)
newTitle = host + sep + newTitle;
var uri = this.mURIFixup.createExposableURI(
this.mCurrentBrowser.currentURI);
if (uri.host)
newTitle = uri.prePath + sep + newTitle;
}
} catch (e) {}