fix for bug 209220 - now that i18n APIs take ASCII charset names, update consumers to avoid excess conversions.. which usually means storing charset names as ASCII and updating a few other APIs
r=jkeiser, sr=jst and some great comments from jshin@mailaps.org
This commit is contained in:
@@ -389,7 +389,7 @@ nsWebShell::LoadDocument(const char* aURL,
|
||||
muDV->GetHintCharacterSetSource(&hint);
|
||||
if( aSource > hint )
|
||||
{
|
||||
muDV->SetHintCharacterSet(NS_ConvertASCIItoUCS2(aCharset).get());
|
||||
muDV->SetHintCharacterSet(nsDependentCString(aCharset));
|
||||
muDV->SetHintCharacterSetSource(aSource);
|
||||
if(eCharsetReloadRequested != mCharsetReloadState)
|
||||
{
|
||||
@@ -425,7 +425,7 @@ nsWebShell::ReloadDocument(const char* aCharset,
|
||||
muDV->GetHintCharacterSetSource(&hint);
|
||||
if( aSource > hint )
|
||||
{
|
||||
muDV->SetHintCharacterSet(NS_ConvertASCIItoUCS2(aCharset).get());
|
||||
muDV->SetHintCharacterSet(nsDependentCString(aCharset));
|
||||
muDV->SetHintCharacterSetSource(aSource);
|
||||
if(eCharsetReloadRequested != mCharsetReloadState)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user