Patch for bug 209699 (convert some consumers over to CopyUTF8toUTF16 / CopyUTF16toUTF8). r=jshin, sr=jst.
git-svn-id: svn://10.0.0.236/trunk@150684 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -1996,15 +1996,15 @@ nsHTMLDocument::SetDomain(const nsAString& aDomain)
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
nsCAutoString scheme;
|
||||
if (NS_FAILED(uri->GetScheme(scheme)))
|
||||
nsCAutoString newURIString;
|
||||
if (NS_FAILED(uri->GetScheme(newURIString)))
|
||||
return NS_ERROR_FAILURE;
|
||||
nsCAutoString path;
|
||||
if (NS_FAILED(uri->GetPath(path)))
|
||||
return NS_ERROR_FAILURE;
|
||||
NS_ConvertUTF8toUCS2 newURIString(scheme);
|
||||
newURIString.Append(NS_LITERAL_STRING("://") + aDomain +
|
||||
NS_ConvertUTF8toUCS2(path));
|
||||
newURIString.Append(NS_LITERAL_CSTRING("://"));
|
||||
AppendUTF16toUTF8(aDomain, newURIString);
|
||||
newURIString.Append(path);
|
||||
|
||||
nsCOMPtr<nsIURI> newURI;
|
||||
if (NS_FAILED(NS_NewURI(getter_AddRefs(newURI), newURIString)))
|
||||
|
||||
Reference in New Issue
Block a user