From d414acba900ab8f7c8407d46915e37dcf0c1298c Mon Sep 17 00:00:00 2001 From: Steve Block Date: Fri, 4 Dec 2009 13:42:01 +0000 Subject: 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 --- WebCore/platform/text/TextCodecICU.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'WebCore') 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"); -- cgit v1.1