diff options
author | Steve Block <steveblock@google.com> | 2009-12-04 13:42:01 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2009-12-04 13:49:07 +0000 |
commit | d414acba900ab8f7c8407d46915e37dcf0c1298c (patch) | |
tree | 776406426562789f925c906a3b6a484ce35bae45 /WebCore | |
parent | 472affe311f3854aaac7cca73d398d36a9eefaf3 (diff) | |
download | external_webkit-d414acba900ab8f7c8407d46915e37dcf0c1298c.zip external_webkit-d414acba900ab8f7c8407d46915e37dcf0c1298c.tar.gz external_webkit-d414acba900ab8f7c8407d46915e37dcf0c1298c.tar.bz2 |
Enables x-mac-cyrillic on Android, now that this is in our version of ICU.
See https://android-git.corp.google.com/g/#change,34457,
which adds the encoding to ICU 3.8 in eclair-mr2, and
https://android-git.corp.google.com/g/#change,34758,
which adds the encoding to ICU 4.2 in master.
Change-Id: I2b870c714a3ee397964e6bfe14c95bdcca9ea24a
Diffstat (limited to 'WebCore')
-rw-r--r-- | WebCore/platform/text/TextCodecICU.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/platform/text/TextCodecICU.cpp b/WebCore/platform/text/TextCodecICU.cpp index b8e40a9..7ebce2c 100644 --- a/WebCore/platform/text/TextCodecICU.cpp +++ b/WebCore/platform/text/TextCodecICU.cpp @@ -130,18 +130,14 @@ void TextCodecICU::registerExtendedEncodingNames(EncodingNameRegistrar registrar // Additional aliases. // These are present in modern versions of ICU, but not in ICU 3.2 (shipped with Mac OS X 10.4). registrar("macroman", "macintosh"); -#ifndef ANDROID // Android does not have x-mac-cyrillic in its ICU library registrar("maccyrillic", "x-mac-cyrillic"); -#endif // Additional aliases that historically were present in the encoding // table in WebKit on Macintosh that don't seem to be present in ICU. // Perhaps we can prove these are not used on the web and remove them. // Or perhaps we can get them added to ICU. registrar("xmacroman", "macintosh"); -#ifndef ANDROID // Android does not have x-mac-cyrillic in its ICU library registrar("xmacukrainian", "x-mac-cyrillic"); -#endif registrar("cnbig5", "Big5"); registrar("xxbig5", "Big5"); registrar("cngb", "GBK"); |