зеркало из https://github.com/mozilla/gecko-dev.git
fix bug 87413. r=shanjian sr=sfraser
backout shanjian's check in which cuase infinite loop while auto detect is turn on and got different result from meta tag
This commit is contained in:
Родитель
0982dafaf1
Коммит
266841c389
|
@ -630,11 +630,14 @@ nsWebShell::ReloadDocument(const char* aCharset,
|
|||
{
|
||||
muDV->SetHintCharacterSet(NS_ConvertASCIItoUCS2(aCharset).get());
|
||||
muDV->SetHintCharacterSetSource((PRInt32)aSource);
|
||||
if(eCharsetReloadRequested != mCharsetReloadState)
|
||||
{
|
||||
mCharsetReloadState = eCharsetReloadRequested;
|
||||
return Reload(LOAD_FLAGS_CHARSET_CHANGE);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче