diff options
| author | Feng Qian <> | 2009-04-10 18:11:29 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-10 18:11:29 -0700 |
| commit | 8f72e70a9fd78eec56623b3a62e68f16b7b27e28 (patch) | |
| tree | 181bf9a400c30a1bf34ea6d72560e8d00111d549 /WebCore/platform/ThreadGlobalData.cpp | |
| parent | 7ed56f225e0ade046e1c2178977f72b2d896f196 (diff) | |
| download | external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.zip external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.gz external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.bz2 | |
AI 145796: Land the WebKit merge @r42026.
Automated import of CL 145796
Diffstat (limited to 'WebCore/platform/ThreadGlobalData.cpp')
| -rw-r--r-- | WebCore/platform/ThreadGlobalData.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/WebCore/platform/ThreadGlobalData.cpp b/WebCore/platform/ThreadGlobalData.cpp index 9bf0bf2..903af66 100644 --- a/WebCore/platform/ThreadGlobalData.cpp +++ b/WebCore/platform/ThreadGlobalData.cpp @@ -29,6 +29,7 @@ #include "EventNames.h" #include "StringImpl.h" +#include "ThreadTimers.h" #include <wtf/UnusedParam.h> #if USE(ICU_UNICODE) @@ -70,6 +71,7 @@ ThreadGlobalData::ThreadGlobalData() : m_emptyString(new StringImpl) , m_atomicStringTable(new HashSet<StringImpl*>) , m_eventNames(new EventNames) + , m_threadTimers(new ThreadTimers) #if USE(ICU_UNICODE) , m_cachedConverterICU(new ICUConverterWrapper) #endif @@ -90,6 +92,7 @@ ThreadGlobalData::~ThreadGlobalData() delete m_eventNames; delete m_atomicStringTable; + delete m_threadTimers; ASSERT(isMainThread() || m_emptyString->hasOneRef()); // We intentionally don't clean up static data on application quit, so there will be many strings remaining on the main thread. delete m_emptyString; |