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

Side by Side Diff: third_party/WebKit/JavaScriptCore/wtf/MainThread.cpp

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 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 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 DEFINE_STATIC_LOCAL(Mutex, staticMutex, ()); 57 DEFINE_STATIC_LOCAL(Mutex, staticMutex, ());
58 return staticMutex; 58 return staticMutex;
59 } 59 }
60 60
61 static FunctionQueue& functionQueue() 61 static FunctionQueue& functionQueue()
62 { 62 {
63 DEFINE_STATIC_LOCAL(FunctionQueue, staticFunctionQueue, ()); 63 DEFINE_STATIC_LOCAL(FunctionQueue, staticFunctionQueue, ());
64 return staticFunctionQueue; 64 return staticFunctionQueue;
65 } 65 }
66 66
67 #if !PLATFORM(WIN) && !PLATFORM(CHROMIUM) 67 #if !PLATFORM(WIN)
68 void initializeMainThread() 68 void initializeMainThread()
69 { 69 {
70 mainThreadFunctionQueueMutex(); 70 mainThreadFunctionQueueMutex();
71 } 71 }
72 #endif 72 #endif
73 73
74 void dispatchFunctionsFromMainThread() 74 void dispatchFunctionsFromMainThread()
75 { 75 {
76 ASSERT(isMainThread()); 76 ASSERT(isMainThread());
77 77
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 return; 134 return;
135 135
136 callbacksPaused = paused; 136 callbacksPaused = paused;
137 137
138 if (!callbacksPaused) 138 if (!callbacksPaused)
139 scheduleDispatchFunctionsOnMainThread(); 139 scheduleDispatchFunctionsOnMainThread();
140 } 140 }
141 141
142 } // namespace WTF 142 } // namespace WTF
143 143
OLDNEW
« no previous file with comments | « third_party/WebKit/JavaScriptCore/wtf/HashTraits.h ('k') | third_party/WebKit/JavaScriptCore/wtf/TypeTraits.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698