From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 24 May 2011 11:24:40 +0100 Subject: Merge WebKit at r80534: Intial merge by Git Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61 --- .../WebCore/platform/text/TextEncodingRegistry.cpp | 28 +++++++++------------- 1 file changed, 11 insertions(+), 17 deletions(-) (limited to 'Source/WebCore/platform/text/TextEncodingRegistry.cpp') diff --git a/Source/WebCore/platform/text/TextEncodingRegistry.cpp b/Source/WebCore/platform/text/TextEncodingRegistry.cpp index 1dc09ee..f604227 100644 --- a/Source/WebCore/platform/text/TextEncodingRegistry.cpp +++ b/Source/WebCore/platform/text/TextEncodingRegistry.cpp @@ -58,6 +58,9 @@ #include "TextCodecWinCE.h" #endif +#include +#include + using namespace WTF; namespace WebCore { @@ -220,31 +223,22 @@ static void buildBaseTextCodecMaps() TextCodecLatin1::registerEncodingNames(addToTextEncodingNameMap); TextCodecLatin1::registerCodecs(addToTextCodecMap); +#if USE(BUILTIN_UTF8_CODEC) + TextCodecUTF8::registerEncodingNames(addToTextEncodingNameMap); + TextCodecUTF8::registerCodecs(addToTextCodecMap); +#endif + TextCodecUTF16::registerEncodingNames(addToTextEncodingNameMap); TextCodecUTF16::registerCodecs(addToTextCodecMap); TextCodecUserDefined::registerEncodingNames(addToTextEncodingNameMap); TextCodecUserDefined::registerCodecs(addToTextCodecMap); -#if USE(ICU_UNICODE) - TextCodecICU::registerBaseEncodingNames(addToTextEncodingNameMap); - TextCodecICU::registerBaseCodecs(addToTextCodecMap); -#endif - #if USE(GLIB_UNICODE) + // FIXME: This is not needed. The code above covers all the base codecs. TextCodecGtk::registerBaseEncodingNames(addToTextEncodingNameMap); TextCodecGtk::registerBaseCodecs(addToTextCodecMap); #endif - -#if USE(BREWMP_UNICODE) - TextCodecBrew::registerBaseEncodingNames(addToTextEncodingNameMap); - TextCodecBrew::registerBaseCodecs(addToTextCodecMap); -#endif - -#if OS(WINCE) && !PLATFORM(QT) - TextCodecWinCE::registerBaseEncodingNames(addToTextEncodingNameMap); - TextCodecWinCE::registerBaseCodecs(addToTextCodecMap); -#endif } static void addEncodingName(HashSet* set, const char* name) @@ -303,8 +297,8 @@ bool shouldShowBackslashAsCurrencySymbolIn(const char* canonicalEncodingName) static void extendTextCodecMaps() { #if USE(ICU_UNICODE) - TextCodecICU::registerExtendedEncodingNames(addToTextEncodingNameMap); - TextCodecICU::registerExtendedCodecs(addToTextCodecMap); + TextCodecICU::registerEncodingNames(addToTextEncodingNameMap); + TextCodecICU::registerCodecs(addToTextCodecMap); #endif #if USE(QT4_UNICODE) -- cgit v1.1