| Index: third_party/WebKit/Source/platform/wtf/text/TextCodecICU.cpp
|
| diff --git a/third_party/WebKit/Source/platform/wtf/text/TextCodecICU.cpp b/third_party/WebKit/Source/platform/wtf/text/TextCodecICU.cpp
|
| index cb399fe6947d22cf08771c39feb0173a8f95939c..b1efd9d236b087b75178df70bc62857f449ba490 100644
|
| --- a/third_party/WebKit/Source/platform/wtf/text/TextCodecICU.cpp
|
| +++ b/third_party/WebKit/Source/platform/wtf/text/TextCodecICU.cpp
|
| @@ -26,6 +26,9 @@
|
|
|
| #include "platform/wtf/text/TextCodecICU.h"
|
|
|
| +#include <unicode/ucnv.h>
|
| +#include <unicode/ucnv_cb.h>
|
| +#include <memory>
|
| #include "platform/wtf/Assertions.h"
|
| #include "platform/wtf/PtrUtil.h"
|
| #include "platform/wtf/StringExtras.h"
|
| @@ -34,9 +37,6 @@
|
| #include "platform/wtf/text/CString.h"
|
| #include "platform/wtf/text/CharacterNames.h"
|
| #include "platform/wtf/text/StringBuilder.h"
|
| -#include <memory>
|
| -#include <unicode/ucnv.h>
|
| -#include <unicode/ucnv_cb.h>
|
|
|
| namespace WTF {
|
|
|
| @@ -97,13 +97,13 @@ void TextCodecICU::RegisterEncodingNames(EncodingNameRegistrar registrar) {
|
| if (!strcmp(standard_name, "GB2312") ||
|
| !strcmp(standard_name, "GB_2312-80")) {
|
| standard_name = "GBK";
|
| - // Similarly, EUC-KR encodings all map to an extended version, but
|
| - // per HTML5, the canonical name still should be EUC-KR.
|
| + // Similarly, EUC-KR encodings all map to an extended version, but
|
| + // per HTML5, the canonical name still should be EUC-KR.
|
| } else if (!strcmp(standard_name, "EUC-KR") ||
|
| !strcmp(standard_name, "KSC_5601") ||
|
| !strcmp(standard_name, "cp1363")) {
|
| standard_name = "EUC-KR";
|
| - // And so on.
|
| + // And so on.
|
| } else if (!strcasecmp(standard_name, "iso-8859-9")) {
|
| // This name is returned in different case by ICU 3.2 and 3.6.
|
| standard_name = "windows-1254";
|
|
|