| Index: Source/modules/encoding/TextDecoder.cpp
|
| diff --git a/Source/modules/encoding/TextDecoder.cpp b/Source/modules/encoding/TextDecoder.cpp
|
| index 69d37d050a4bf4165db0af3150655c7f24844327..c1fad08a059c574dfb6a33ebf8b233e6d057f290 100644
|
| --- a/Source/modules/encoding/TextDecoder.cpp
|
| +++ b/Source/modules/encoding/TextDecoder.cpp
|
| @@ -68,7 +68,12 @@ TextDecoder::~TextDecoder()
|
|
|
| String TextDecoder::encoding() const
|
| {
|
| - return String(m_encoding.name()).lower();
|
| + String name = String(m_encoding.name()).lower();
|
| + // Where possible, encoding aliases should be handled by changes to Chromium's ICU or Blink's WTF.
|
| + // The same codec is used, but WTF maintains a different name/identity for these.
|
| + if (name == "iso-8859-1" || name == "us-ascii")
|
| + return "windows-1252";
|
| + return name;
|
| }
|
|
|
| String TextDecoder::decode(ArrayBufferView* input, const Dictionary& options, ExceptionState& es)
|
|
|