diff options
author | Feng Qian <fqian@google.com> | 2009-06-17 12:12:20 -0700 |
---|---|---|
committer | Feng Qian <fqian@google.com> | 2009-06-17 12:12:20 -0700 |
commit | 5f1ab04193ad0130ca8204aadaceae083aca9881 (patch) | |
tree | 5a92cd389e2cfe7fb67197ce14b38469462379f8 /WebCore/platform/ThreadGlobalData.h | |
parent | 194315e5a908cc8ed67d597010544803eef1ac59 (diff) | |
download | external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.zip external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.gz external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.bz2 |
Get WebKit r44544.
Diffstat (limited to 'WebCore/platform/ThreadGlobalData.h')
-rw-r--r-- | WebCore/platform/ThreadGlobalData.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/WebCore/platform/ThreadGlobalData.h b/WebCore/platform/ThreadGlobalData.h index 7faca36..e0aa092 100644 --- a/WebCore/platform/ThreadGlobalData.h +++ b/WebCore/platform/ThreadGlobalData.h @@ -48,7 +48,7 @@ namespace WebCore { HashSet<StringImpl*>& atomicStringTable() { return *m_atomicStringTable; } ThreadTimers& threadTimers() { return *m_threadTimers; } -#if USE(ICU_UNICODE) +#if USE(ICU_UNICODE) || USE(GLIB_ICU_UNICODE_HYBRID) ICUConverterWrapper& cachedConverterICU() { return *m_cachedConverterICU; } #endif @@ -62,7 +62,11 @@ namespace WebCore { EventNames* m_eventNames; ThreadTimers* m_threadTimers; -#if USE(ICU_UNICODE) +#ifndef NDEBUG + bool m_isMainThread; +#endif + +#if USE(ICU_UNICODE) || USE(GLIB_ICU_UNICODE_HYBRID) ICUConverterWrapper* m_cachedConverterICU; #endif |