Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Side by Side Diff: Source/WebCore/platform/ThreadGlobalData.cpp

Issue 8210003: Merge 96999 - Make isXMLMIMEType regex use TLS (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/WebCore/platform/ThreadGlobalData.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "ThreadGlobalData.h" 28 #include "ThreadGlobalData.h"
29 29
30 #include "DOMImplementation.h"
30 #include "EventNames.h" 31 #include "EventNames.h"
31 #include "ThreadTimers.h" 32 #include "ThreadTimers.h"
32 #include <wtf/MainThread.h> 33 #include <wtf/MainThread.h>
33 #include <wtf/UnusedParam.h> 34 #include <wtf/UnusedParam.h>
34 #include <wtf/WTFThreadData.h> 35 #include <wtf/WTFThreadData.h>
35 #include <wtf/text/StringImpl.h> 36 #include <wtf/text/StringImpl.h>
36 37
37 #if USE(ICU_UNICODE) 38 #if USE(ICU_UNICODE)
38 #include "TextCodecICU.h" 39 #include "TextCodecICU.h"
39 #endif 40 #endif
(...skipping 12 matching lines...) Expand all
52 53
53 #if ENABLE(WORKERS) 54 #if ENABLE(WORKERS)
54 ThreadSpecific<ThreadGlobalData>* ThreadGlobalData::staticData; 55 ThreadSpecific<ThreadGlobalData>* ThreadGlobalData::staticData;
55 #else 56 #else
56 ThreadGlobalData* ThreadGlobalData::staticData; 57 ThreadGlobalData* ThreadGlobalData::staticData;
57 #endif 58 #endif
58 59
59 ThreadGlobalData::ThreadGlobalData() 60 ThreadGlobalData::ThreadGlobalData()
60 : m_eventNames(new EventNames) 61 : m_eventNames(new EventNames)
61 , m_threadTimers(new ThreadTimers) 62 , m_threadTimers(new ThreadTimers)
63 , m_xmlTypeRegExp(new XMLMIMETypeRegExp)
62 #ifndef NDEBUG 64 #ifndef NDEBUG
63 , m_isMainThread(isMainThread()) 65 , m_isMainThread(isMainThread())
64 #endif 66 #endif
65 #if USE(ICU_UNICODE) 67 #if USE(ICU_UNICODE)
66 , m_cachedConverterICU(new ICUConverterWrapper) 68 , m_cachedConverterICU(new ICUConverterWrapper)
67 #endif 69 #endif
68 #if PLATFORM(MAC) 70 #if PLATFORM(MAC)
69 , m_cachedConverterTEC(new TECConverterWrapper) 71 , m_cachedConverterTEC(new TECConverterWrapper)
70 #endif 72 #endif
71 { 73 {
(...skipping 19 matching lines...) Expand all
91 93
92 #if USE(ICU_UNICODE) 94 #if USE(ICU_UNICODE)
93 delete m_cachedConverterICU; 95 delete m_cachedConverterICU;
94 m_cachedConverterICU = 0; 96 m_cachedConverterICU = 0;
95 #endif 97 #endif
96 98
97 delete m_eventNames; 99 delete m_eventNames;
98 m_eventNames = 0; 100 m_eventNames = 0;
99 delete m_threadTimers; 101 delete m_threadTimers;
100 m_threadTimers = 0; 102 m_threadTimers = 0;
103 delete m_xmlTypeRegExp;
104 m_xmlTypeRegExp = 0;
101 } 105 }
102 106
103 } // namespace WebCore 107 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/platform/ThreadGlobalData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698