| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 * | 24 * |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include "config.h" | 27 #include "config.h" |
| 28 #include "core/platform/ThreadGlobalData.h" | 28 #include "core/platform/ThreadGlobalData.h" |
| 29 | 29 |
| 30 #include "core/events/ThreadLocalEventNames.h" | |
| 31 #include "core/inspector/InspectorCounters.h" | 30 #include "core/inspector/InspectorCounters.h" |
| 32 #include "platform/PlatformThreadData.h" | 31 #include "platform/PlatformThreadData.h" |
| 33 #include "wtf/MainThread.h" | 32 #include "wtf/MainThread.h" |
| 34 #include "wtf/ThreadSpecific.h" | 33 #include "wtf/ThreadSpecific.h" |
| 35 #include "wtf/Threading.h" | 34 #include "wtf/Threading.h" |
| 36 #include "wtf/WTFThreadData.h" | 35 #include "wtf/WTFThreadData.h" |
| 37 #include "wtf/text/StringImpl.h" | 36 #include "wtf/text/StringImpl.h" |
| 38 | 37 |
| 39 using namespace WTF; | 38 using namespace WTF; |
| 40 | 39 |
| 41 namespace WebCore { | 40 namespace WebCore { |
| 42 | 41 |
| 43 ThreadSpecific<ThreadGlobalData>* ThreadGlobalData::staticData; | 42 ThreadSpecific<ThreadGlobalData>* ThreadGlobalData::staticData; |
| 44 | 43 |
| 45 ThreadGlobalData::ThreadGlobalData() | 44 ThreadGlobalData::ThreadGlobalData() |
| 46 : m_eventNames(adoptPtr(new ThreadLocalEventNames)) | 45 : m_inspectorCounters(adoptPtr(new ThreadLocalInspectorCounters())) |
| 47 , m_inspectorCounters(adoptPtr(new ThreadLocalInspectorCounters())) | |
| 48 { | 46 { |
| 49 // This constructor will have been called on the main thread before being ca
lled on | 47 // This constructor will have been called on the main thread before being ca
lled on |
| 50 // any other thread, and is only called once per thread - this makes this a
convenient | 48 // any other thread, and is only called once per thread - this makes this a
convenient |
| 51 // point to call methods that internally perform a one-time initialization t
hat is not | 49 // point to call methods that internally perform a one-time initialization t
hat is not |
| 52 // threadsafe. | 50 // threadsafe. |
| 53 wtfThreadData(); | 51 wtfThreadData(); |
| 54 PlatformThreadData::current(); | 52 PlatformThreadData::current(); |
| 55 StringImpl::empty(); | 53 StringImpl::empty(); |
| 56 } | 54 } |
| 57 | 55 |
| 58 ThreadGlobalData::~ThreadGlobalData() | 56 ThreadGlobalData::~ThreadGlobalData() |
| 59 { | 57 { |
| 60 } | 58 } |
| 61 | 59 |
| 62 void ThreadGlobalData::destroy() | 60 void ThreadGlobalData::destroy() |
| 63 { | 61 { |
| 64 m_inspectorCounters.clear(); | 62 m_inspectorCounters.clear(); |
| 65 m_eventNames.clear(); | |
| 66 PlatformThreadData::current().destroy(); | 63 PlatformThreadData::current().destroy(); |
| 67 } | 64 } |
| 68 | 65 |
| 69 } // namespace WebCore | 66 } // namespace WebCore |
| OLD | NEW |