From 2bde8e466a4451c7319e3a072d118917957d6554 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 25 May 2011 19:08:45 +0100 Subject: Merge WebKit at r82507: Initial merge by git Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e --- Source/WebCore/platform/text/TextCodecICU.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'Source/WebCore/platform/text/TextCodecICU.cpp') diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp index d07b50e..0d99196 100644 --- a/Source/WebCore/platform/text/TextCodecICU.cpp +++ b/Source/WebCore/platform/text/TextCodecICU.cpp @@ -149,13 +149,6 @@ void TextCodecICU::registerEncodingNames(EncodingNameRegistrar registrar) registrar("x-windows-949", "windows-949"); registrar("x-uhc", "windows-949"); registrar("shift-jis", "Shift_JIS"); -#if !USE(BUILTIN_UTF8_CODEC) - registrar("unicode11utf8", "UTF-8"); - registrar("unicode20utf8", "UTF-8"); - registrar("x-unicode20utf8", "UTF-8"); - registrar("utf8", "UTF-8"); - registrar("UTF-8", "UTF-8"); -#endif // These aliases are present in modern versions of ICU, but use different codecs, and have no standard names. // They are not present in ICU 3.2. -- cgit v1.1