| Index: third_party/WebKit/Source/modules/encoding/TextDecoder.cpp
|
| diff --git a/third_party/WebKit/Source/modules/encoding/TextDecoder.cpp b/third_party/WebKit/Source/modules/encoding/TextDecoder.cpp
|
| index a8b3720082d19776f717ff6b927fc2c6595697a6..523b9f6ef5cde2031bb622495393e8dbd1f13559 100644
|
| --- a/third_party/WebKit/Source/modules/encoding/TextDecoder.cpp
|
| +++ b/third_party/WebKit/Source/modules/encoding/TextDecoder.cpp
|
| @@ -68,8 +68,9 @@ TextDecoder::~TextDecoder() {}
|
|
|
| String TextDecoder::encoding() const {
|
| 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.
|
| + // 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;
|
|
|