diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/platform/text/TextEncodingRegistry.cpp | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/platform/text/TextEncodingRegistry.cpp')
| -rw-r--r-- | WebCore/platform/text/TextEncodingRegistry.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/WebCore/platform/text/TextEncodingRegistry.cpp b/WebCore/platform/text/TextEncodingRegistry.cpp index 40fcdc5..fbe5826 100644 --- a/WebCore/platform/text/TextEncodingRegistry.cpp +++ b/WebCore/platform/text/TextEncodingRegistry.cpp @@ -31,6 +31,7 @@ #include "TextCodecLatin1.h" #include "TextCodecUserDefined.h" #include "TextCodecUTF16.h" +#include "TextEncoding.h" #include <wtf/ASCIICType.h> #include <wtf/Assertions.h> #include <wtf/HashFunctions.h> @@ -51,6 +52,9 @@ #if USE(GLIB_UNICODE) #include "gtk/TextCodecGtk.h" #endif +#if USE(BREWMP_UNICODE) +#include "brew/TextCodecBrew.h" +#endif #if OS(WINCE) && !PLATFORM(QT) #include "TextCodecWinCE.h" #endif @@ -235,6 +239,11 @@ static void buildBaseTextCodecMaps() 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); |