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

Side by Side Diff: third_party/WebKit/Source/wtf/WTF.cpp

Issue 1818233003: Merge WTF::initializeMainThread into WTF::initialize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 14 matching lines...) Expand all
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "wtf/WTF.h" 31 #include "wtf/WTF.h"
32 32
33 #include "wtf/ArrayBufferContents.h" 33 #include "wtf/ArrayBufferContents.h"
34 #include "wtf/Assertions.h" 34 #include "wtf/Assertions.h"
35 #include "wtf/Functional.h"
35 #include "wtf/Partitions.h" 36 #include "wtf/Partitions.h"
37 #include "wtf/Threading.h"
38 #include "wtf/text/AtomicString.h"
39 #include "wtf/text/StringStatics.h"
36 40
37 namespace WTF { 41 namespace WTF {
38 42
39 extern void initializeThreading(); 43 extern void initializeThreading();
40 44
41 bool s_initialized; 45 bool s_initialized;
42 bool s_shutdown; 46 bool s_shutdown;
47 void (*s_callOnMainThreadFunction)(MainThreadFunction, void*);
48 ThreadIdentifier s_mainThreadIdentifier;
43 49
44 void initialize() 50 namespace internal {
51
52 void callOnMainThread(MainThreadFunction* function, void* context)
53 {
54 (*s_callOnMainThreadFunction)(function, context);
55 }
56
57 } // namespace internal
58
59 bool isMainThread()
60 {
61 return currentThread() == s_mainThreadIdentifier;
62 }
63
64 void initialize(void (*callOnMainThreadFunction)(MainThreadFunction, void*))
45 { 65 {
46 // WTF, and Blink in general, cannot handle being re-initialized, even if sh utdown first. 66 // WTF, and Blink in general, cannot handle being re-initialized, even if sh utdown first.
47 // Make that explicit here. 67 // Make that explicit here.
48 RELEASE_ASSERT(!s_initialized); 68 RELEASE_ASSERT(!s_initialized);
49 RELEASE_ASSERT(!s_shutdown); 69 RELEASE_ASSERT(!s_shutdown);
50 s_initialized = true; 70 s_initialized = true;
51 initializeThreading(); 71 initializeThreading();
72
73 s_callOnMainThreadFunction = callOnMainThreadFunction;
74 s_mainThreadIdentifier = currentThread();
75 AtomicString::init();
76 StringStatics::init();
52 } 77 }
53 78
54 void shutdown() 79 void shutdown()
55 { 80 {
56 RELEASE_ASSERT(s_initialized); 81 RELEASE_ASSERT(s_initialized);
57 RELEASE_ASSERT(!s_shutdown); 82 RELEASE_ASSERT(!s_shutdown);
58 s_shutdown = true; 83 s_shutdown = true;
59 } 84 }
60 85
61 bool isShutdown() 86 bool isShutdown()
62 { 87 {
63 return s_shutdown; 88 return s_shutdown;
64 } 89 }
65 90
66 } // namespace WTF 91 } // namespace WTF
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/wtf/WTF.h ('k') | third_party/WebKit/Source/wtf/testing/RunAllTests.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698