diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 09:55:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 09:55:06 -0800 |
| commit | b880d713c04257ca40abfef97c300afdead423b8 (patch) | |
| tree | 6982576c228bcd1a7efe98afed544d840751094c /WebCore/platform/ThreadGlobalData.cpp | |
| parent | e2e7a5c57b53f01e63a0245b4420d54b454cb373 (diff) | |
| parent | 643ca7872b450ea4efacab6188849e5aac2ba161 (diff) | |
| download | external_webkit-b880d713c04257ca40abfef97c300afdead423b8.zip external_webkit-b880d713c04257ca40abfef97c300afdead423b8.tar.gz external_webkit-b880d713c04257ca40abfef97c300afdead423b8.tar.bz2 | |
am 643ca787: Merge webkit.org at r51976 : Initial merge by git.
Merge commit '643ca7872b450ea4efacab6188849e5aac2ba161' into eclair-mr2-plus-aosp
* commit '643ca7872b450ea4efacab6188849e5aac2ba161':
Merge webkit.org at r51976 : Initial merge by git.
Diffstat (limited to 'WebCore/platform/ThreadGlobalData.cpp')
| -rw-r--r-- | WebCore/platform/ThreadGlobalData.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/platform/ThreadGlobalData.cpp b/WebCore/platform/ThreadGlobalData.cpp index a43e9bd..26a9728 100644 --- a/WebCore/platform/ThreadGlobalData.cpp +++ b/WebCore/platform/ThreadGlobalData.cpp @@ -32,7 +32,7 @@ #include "ThreadTimers.h" #include <wtf/UnusedParam.h> -#if USE(ICU_UNICODE) || USE(GLIB_ICU_UNICODE_HYBRID) +#if USE(ICU_UNICODE) #include "TextCodecICU.h" #endif @@ -75,7 +75,7 @@ ThreadGlobalData::ThreadGlobalData() #ifndef NDEBUG , m_isMainThread(isMainThread()) #endif -#if USE(ICU_UNICODE) || USE(GLIB_ICU_UNICODE_HYBRID) +#if USE(ICU_UNICODE) , m_cachedConverterICU(new ICUConverterWrapper) #endif #if PLATFORM(MAC) @@ -89,7 +89,7 @@ ThreadGlobalData::~ThreadGlobalData() #if PLATFORM(MAC) delete m_cachedConverterTEC; #endif -#if USE(ICU_UNICODE) || USE(GLIB_ICU_UNICODE_HYBRID) +#if USE(ICU_UNICODE) delete m_cachedConverterICU; #endif |