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

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

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/dom/DOMImplementation.cpp ('k') | Source/WebCore/platform/ThreadGlobalData.cpp » ('j') | 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
(...skipping 25 matching lines...) Expand all
36 #if ENABLE(WORKERS) 36 #if ENABLE(WORKERS)
37 #include <wtf/ThreadSpecific.h> 37 #include <wtf/ThreadSpecific.h>
38 #include <wtf/Threading.h> 38 #include <wtf/Threading.h>
39 using WTF::ThreadSpecific; 39 using WTF::ThreadSpecific;
40 #endif 40 #endif
41 41
42 namespace WebCore { 42 namespace WebCore {
43 43
44 class EventNames; 44 class EventNames;
45 class ThreadTimers; 45 class ThreadTimers;
46 class XMLMIMETypeRegExp;
46 47
47 struct ICUConverterWrapper; 48 struct ICUConverterWrapper;
48 struct TECConverterWrapper; 49 struct TECConverterWrapper;
49 50
50 class ThreadGlobalData { 51 class ThreadGlobalData {
51 WTF_MAKE_NONCOPYABLE(ThreadGlobalData); 52 WTF_MAKE_NONCOPYABLE(ThreadGlobalData);
52 public: 53 public:
53 ThreadGlobalData(); 54 ThreadGlobalData();
54 ~ThreadGlobalData(); 55 ~ThreadGlobalData();
55 void destroy(); // called on workers to clean up the ThreadGlobalData be fore the thread exits. 56 void destroy(); // called on workers to clean up the ThreadGlobalData be fore the thread exits.
56 57
57 EventNames& eventNames() { return *m_eventNames; } 58 EventNames& eventNames() { return *m_eventNames; }
58 ThreadTimers& threadTimers() { return *m_threadTimers; } 59 ThreadTimers& threadTimers() { return *m_threadTimers; }
60 XMLMIMETypeRegExp& xmlTypeRegExp() { return *m_xmlTypeRegExp; }
59 61
60 #if USE(ICU_UNICODE) 62 #if USE(ICU_UNICODE)
61 ICUConverterWrapper& cachedConverterICU() { return *m_cachedConverterICU ; } 63 ICUConverterWrapper& cachedConverterICU() { return *m_cachedConverterICU ; }
62 #endif 64 #endif
63 65
64 #if PLATFORM(MAC) 66 #if PLATFORM(MAC)
65 TECConverterWrapper& cachedConverterTEC() { return *m_cachedConverterTEC ; } 67 TECConverterWrapper& cachedConverterTEC() { return *m_cachedConverterTEC ; }
66 #endif 68 #endif
67 69
68 private: 70 private:
69 EventNames* m_eventNames; 71 EventNames* m_eventNames;
70 ThreadTimers* m_threadTimers; 72 ThreadTimers* m_threadTimers;
73 XMLMIMETypeRegExp* m_xmlTypeRegExp;
71 74
72 #ifndef NDEBUG 75 #ifndef NDEBUG
73 bool m_isMainThread; 76 bool m_isMainThread;
74 #endif 77 #endif
75 78
76 #if USE(ICU_UNICODE) 79 #if USE(ICU_UNICODE)
77 ICUConverterWrapper* m_cachedConverterICU; 80 ICUConverterWrapper* m_cachedConverterICU;
78 #endif 81 #endif
79 82
80 #if PLATFORM(MAC) 83 #if PLATFORM(MAC)
(...skipping 24 matching lines...) Expand all
105 // ThreadGlobalData constructor indirectly uses staticData, so we need t o set up the memory before invoking it. 108 // ThreadGlobalData constructor indirectly uses staticData, so we need t o set up the memory before invoking it.
106 new (ThreadGlobalData::staticData) ThreadGlobalData; 109 new (ThreadGlobalData::staticData) ThreadGlobalData;
107 } 110 }
108 return *ThreadGlobalData::staticData; 111 return *ThreadGlobalData::staticData;
109 #endif 112 #endif
110 } 113 }
111 114
112 } // namespace WebCore 115 } // namespace WebCore
113 116
114 #endif // ThreadGlobalData_h 117 #endif // ThreadGlobalData_h
OLDNEW
« no previous file with comments | « Source/WebCore/dom/DOMImplementation.cpp ('k') | Source/WebCore/platform/ThreadGlobalData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698