diff options
34 files changed, 54 insertions, 54 deletions
diff --git a/third_party/WebKit/Source/bindings/core/v8/Dictionary.cpp b/third_party/WebKit/Source/bindings/core/v8/Dictionary.cpp index 2099598..f4b46eb 100644 --- a/third_party/WebKit/Source/bindings/core/v8/Dictionary.cpp +++ b/third_party/WebKit/Source/bindings/core/v8/Dictionary.cpp @@ -46,7 +46,7 @@ namespace blink { static ExceptionState& emptyExceptionState() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(WTF::ThreadSpecific<NonThrowableExceptionState>, exceptionState, new ThreadSpecific<NonThrowableExceptionState>); + DEFINE_THREAD_SAFE_STATIC_LOCAL(WTF::ThreadSpecific<NonThrowableExceptionState>, exceptionState, new ThreadSpecific<NonThrowableExceptionState>); return *exceptionState; } diff --git a/third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp b/third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp index cbbb45b..bbabae0 100644 --- a/third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp @@ -184,7 +184,7 @@ using CSSTextCacheWrapper = CSSTextCache; static CSSTextCache& cssTextCache() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(ThreadSpecific<CSSTextCacheWrapper>, cache, new ThreadSpecific<CSSTextCacheWrapper>); + DEFINE_THREAD_SAFE_STATIC_LOCAL(ThreadSpecific<CSSTextCacheWrapper>, cache, new ThreadSpecific<CSSTextCacheWrapper>); return *cache; } diff --git a/third_party/WebKit/Source/core/events/EventListenerMap.cpp b/third_party/WebKit/Source/core/events/EventListenerMap.cpp index c2b85e5..7c8486f 100644 --- a/third_party/WebKit/Source/core/events/EventListenerMap.cpp +++ b/third_party/WebKit/Source/core/events/EventListenerMap.cpp @@ -49,7 +49,7 @@ namespace blink { #if ENABLE(ASSERT) static Mutex& activeIteratorCountMutex() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(Mutex, mutex, new Mutex()); + DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mutex, new Mutex()); return mutex; } diff --git a/third_party/WebKit/Source/core/fetch/CrossOriginAccessControl.cpp b/third_party/WebKit/Source/core/fetch/CrossOriginAccessControl.cpp index 38be6ee..b6d7ca3 100644 --- a/third_party/WebKit/Source/core/fetch/CrossOriginAccessControl.cpp +++ b/third_party/WebKit/Source/core/fetch/CrossOriginAccessControl.cpp @@ -57,7 +57,7 @@ static PassOwnPtr<HTTPHeaderSet> createAllowedCrossOriginResponseHeadersSet() bool isOnAccessControlResponseHeaderWhitelist(const String& name) { - DEFINE_STATIC_LOCAL_THREAD_SAFE(HTTPHeaderSet, allowedCrossOriginResponseHeaders, (createAllowedCrossOriginResponseHeadersSet().leakPtr())); + DEFINE_THREAD_SAFE_STATIC_LOCAL(HTTPHeaderSet, allowedCrossOriginResponseHeaders, (createAllowedCrossOriginResponseHeadersSet().leakPtr())); return allowedCrossOriginResponseHeaders.contains(name); } @@ -130,9 +130,9 @@ static String buildAccessControlFailureMessage(const String& detail, SecurityOri bool passesAccessControlCheck(const ResourceResponse& response, StoredCredentials includeCredentials, SecurityOrigin* securityOrigin, String& errorDescription, WebURLRequest::RequestContext context) { - DEFINE_STATIC_LOCAL_THREAD_SAFE(AtomicString, allowOriginHeaderName, (new AtomicString("access-control-allow-origin", AtomicString::ConstructFromLiteral))); - DEFINE_STATIC_LOCAL_THREAD_SAFE(AtomicString, allowCredentialsHeaderName, (new AtomicString("access-control-allow-credentials", AtomicString::ConstructFromLiteral))); - DEFINE_STATIC_LOCAL_THREAD_SAFE(AtomicString, allowSuboriginHeaderName, (new AtomicString("access-control-allow-suborigin", AtomicString::ConstructFromLiteral))); + DEFINE_THREAD_SAFE_STATIC_LOCAL(AtomicString, allowOriginHeaderName, (new AtomicString("access-control-allow-origin", AtomicString::ConstructFromLiteral))); + DEFINE_THREAD_SAFE_STATIC_LOCAL(AtomicString, allowCredentialsHeaderName, (new AtomicString("access-control-allow-credentials", AtomicString::ConstructFromLiteral))); + DEFINE_THREAD_SAFE_STATIC_LOCAL(AtomicString, allowSuboriginHeaderName, (new AtomicString("access-control-allow-suborigin", AtomicString::ConstructFromLiteral))); int statusCode = response.httpStatusCode(); diff --git a/third_party/WebKit/Source/core/fetch/FetchUtils.cpp b/third_party/WebKit/Source/core/fetch/FetchUtils.cpp index 96f58da..2c6aa51 100644 --- a/third_party/WebKit/Source/core/fetch/FetchUtils.cpp +++ b/third_party/WebKit/Source/core/fetch/FetchUtils.cpp @@ -70,7 +70,7 @@ ForbiddenHeaderNames::ForbiddenHeaderNames() const ForbiddenHeaderNames& ForbiddenHeaderNames::get() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const ForbiddenHeaderNames, instance, new ForbiddenHeaderNames); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const ForbiddenHeaderNames, instance, new ForbiddenHeaderNames); return instance; } diff --git a/third_party/WebKit/Source/core/fileapi/Blob.cpp b/third_party/WebKit/Source/core/fileapi/Blob.cpp index e415616..4142618 100644 --- a/third_party/WebKit/Source/core/fileapi/Blob.cpp +++ b/third_party/WebKit/Source/core/fileapi/Blob.cpp @@ -69,7 +69,7 @@ URLRegistry& BlobURLRegistry::registry() // (This code assumes it is safe to register or unregister URLs on // BlobURLRegistry (that is implemented by the embedder) on // multiple threads.) - DEFINE_STATIC_LOCAL_THREAD_SAFE(BlobURLRegistry, instance, new BlobURLRegistry()); + DEFINE_THREAD_SAFE_STATIC_LOCAL(BlobURLRegistry, instance, new BlobURLRegistry()); return instance; } diff --git a/third_party/WebKit/Source/core/frame/NavigatorID.cpp b/third_party/WebKit/Source/core/frame/NavigatorID.cpp index 36aa4eb..7a403ae 100644 --- a/third_party/WebKit/Source/core/frame/NavigatorID.cpp +++ b/third_party/WebKit/Source/core/frame/NavigatorID.cpp @@ -67,7 +67,7 @@ String NavigatorID::platform() return "Win32"; #else // Unix-like systems struct utsname osname; - DEFINE_STATIC_LOCAL_THREAD_SAFE(ThreadSpecific<String>, platformName, new ThreadSpecific<String>()); + DEFINE_THREAD_SAFE_STATIC_LOCAL(ThreadSpecific<String>, platformName, new ThreadSpecific<String>()); if (platformName->isNull()) { *platformName = String(uname(&osname) >= 0 ? String(osname.sysname) + String(" ") + String(osname.machine) : emptyString()); } diff --git a/third_party/WebKit/Source/core/inspector/ConsoleMessage.cpp b/third_party/WebKit/Source/core/inspector/ConsoleMessage.cpp index 5451ac6..4ad3293 100644 --- a/third_party/WebKit/Source/core/inspector/ConsoleMessage.cpp +++ b/third_party/WebKit/Source/core/inspector/ConsoleMessage.cpp @@ -21,7 +21,7 @@ unsigned nextMessageId() unsigned value; }; - DEFINE_STATIC_LOCAL_THREAD_SAFE(WTF::ThreadSpecific<MessageId>, messageId, new WTF::ThreadSpecific<MessageId>); + DEFINE_THREAD_SAFE_STATIC_LOCAL(WTF::ThreadSpecific<MessageId>, messageId, new WTF::ThreadSpecific<MessageId>); return ++messageId->value; } diff --git a/third_party/WebKit/Source/core/inspector/MainThreadDebugger.cpp b/third_party/WebKit/Source/core/inspector/MainThreadDebugger.cpp index 0303f97..26c5e13 100644 --- a/third_party/WebKit/Source/core/inspector/MainThreadDebugger.cpp +++ b/third_party/WebKit/Source/core/inspector/MainThreadDebugger.cpp @@ -77,7 +77,7 @@ MainThreadDebugger::~MainThreadDebugger() Mutex& MainThreadDebugger::creationMutex() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(Mutex, mutex, (new Mutex)); + DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mutex, (new Mutex)); return mutex; } diff --git a/third_party/WebKit/Source/core/page/NetworkStateNotifier.cpp b/third_party/WebKit/Source/core/page/NetworkStateNotifier.cpp index 36abcb0..ecc6410 100644 --- a/third_party/WebKit/Source/core/page/NetworkStateNotifier.cpp +++ b/third_party/WebKit/Source/core/page/NetworkStateNotifier.cpp @@ -39,7 +39,7 @@ namespace blink { NetworkStateNotifier& networkStateNotifier() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(NetworkStateNotifier, networkStateNotifier, new NetworkStateNotifier); + DEFINE_THREAD_SAFE_STATIC_LOCAL(NetworkStateNotifier, networkStateNotifier, new NetworkStateNotifier); return networkStateNotifier; } diff --git a/third_party/WebKit/Source/core/svg/SVGElement.cpp b/third_party/WebKit/Source/core/svg/SVGElement.cpp index e4bc03f..19604a1 100644 --- a/third_party/WebKit/Source/core/svg/SVGElement.cpp +++ b/third_party/WebKit/Source/core/svg/SVGElement.cpp @@ -1070,7 +1070,7 @@ bool SVGElement::isAnimatableAttribute(const QualifiedName& name) const { // This static is atomically initialized to dodge a warning about // a race when dumping debug data for a layer. - DEFINE_STATIC_LOCAL_THREAD_SAFE(HashSet<QualifiedName>, animatableAttributes, new HashSet<QualifiedName>()); + DEFINE_THREAD_SAFE_STATIC_LOCAL(HashSet<QualifiedName>, animatableAttributes, new HashSet<QualifiedName>()); if (animatableAttributes.isEmpty()) { const QualifiedName* const animatableAttrs[] = { diff --git a/third_party/WebKit/Source/core/timing/MemoryInfo.cpp b/third_party/WebKit/Source/core/timing/MemoryInfo.cpp index 45f1abb..56a7b40 100644 --- a/third_party/WebKit/Source/core/timing/MemoryInfo.cpp +++ b/third_party/WebKit/Source/core/timing/MemoryInfo.cpp @@ -70,7 +70,7 @@ public: static HeapSizeCache& forCurrentThread() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(ThreadSpecific<HeapSizeCache>, heapSizeCache, new ThreadSpecific<HeapSizeCache>); + DEFINE_THREAD_SAFE_STATIC_LOCAL(ThreadSpecific<HeapSizeCache>, heapSizeCache, new ThreadSpecific<HeapSizeCache>); return *heapSizeCache; } diff --git a/third_party/WebKit/Source/core/timing/PerformanceUserTiming.cpp b/third_party/WebKit/Source/core/timing/PerformanceUserTiming.cpp index b6bf842..68cfe8a 100644 --- a/third_party/WebKit/Source/core/timing/PerformanceUserTiming.cpp +++ b/third_party/WebKit/Source/core/timing/PerformanceUserTiming.cpp @@ -70,7 +70,7 @@ RestrictedKeyMap* createRestrictedKeyMap() const RestrictedKeyMap& restrictedKeyMap() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(RestrictedKeyMap, map, createRestrictedKeyMap()); + DEFINE_THREAD_SAFE_STATIC_LOCAL(RestrictedKeyMap, map, createRestrictedKeyMap()); return map; } diff --git a/third_party/WebKit/Source/core/workers/WorkerThread.cpp b/third_party/WebKit/Source/core/workers/WorkerThread.cpp index bb6fde4..0ce13b4 100644 --- a/third_party/WebKit/Source/core/workers/WorkerThread.cpp +++ b/third_party/WebKit/Source/core/workers/WorkerThread.cpp @@ -89,7 +89,7 @@ private: static Mutex& threadSetMutex() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(Mutex, mutex, new Mutex); + DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mutex, new Mutex); return mutex; } diff --git a/third_party/WebKit/Source/modules/bluetooth/BluetoothUUID.cpp b/third_party/WebKit/Source/modules/bluetooth/BluetoothUUID.cpp index 95924e7..9949e74 100644 --- a/third_party/WebKit/Source/modules/bluetooth/BluetoothUUID.cpp +++ b/third_party/WebKit/Source/modules/bluetooth/BluetoothUUID.cpp @@ -28,7 +28,7 @@ enum class GATTAttribute { NameToAssignedNumberMap* getAssignedNumberToServiceNameMap() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(NameToAssignedNumberMap, servicesMap, []() { + DEFINE_THREAD_SAFE_STATIC_LOCAL(NameToAssignedNumberMap, servicesMap, []() { // https://developer.bluetooth.org/gatt/services/Pages/ServicesHome.aspx NameToAssignedNumberMap* services = new NameToAssignedNumberMap(); services->add("alert_notification", 0x1811); @@ -71,7 +71,7 @@ NameToAssignedNumberMap* getAssignedNumberToServiceNameMap() NameToAssignedNumberMap* getAssignedNumberForCharacteristicNameMap() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(NameToAssignedNumberMap, characteristicsMap, []() { + DEFINE_THREAD_SAFE_STATIC_LOCAL(NameToAssignedNumberMap, characteristicsMap, []() { // https://developer.bluetooth.org/gatt/characteristics/Pages/CharacteristicsHome.aspx NameToAssignedNumberMap* characteristics = new NameToAssignedNumberMap(); characteristics->add("aerobic_heart_rate_lower_limit", 0x2A7E); @@ -243,7 +243,7 @@ NameToAssignedNumberMap* getAssignedNumberForCharacteristicNameMap() NameToAssignedNumberMap* getAssignedNumberForDescriptorNameMap() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(NameToAssignedNumberMap, descriptorsMap, []() { + DEFINE_THREAD_SAFE_STATIC_LOCAL(NameToAssignedNumberMap, descriptorsMap, []() { // https://developer.bluetooth.org/gatt/descriptors/Pages/DescriptorsHomePage.aspx NameToAssignedNumberMap* descriptors = new NameToAssignedNumberMap(); descriptors->add("gatt.characteristic_extended_properties", 0x2900); diff --git a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.cpp b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.cpp index 13c8852..89cd73c 100644 --- a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.cpp +++ b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.cpp @@ -30,7 +30,7 @@ class CompositorWorkerSharedState { public: static CompositorWorkerSharedState& instance() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(CompositorWorkerSharedState, compositorWorkerSharedState, (new CompositorWorkerSharedState())); + DEFINE_THREAD_SAFE_STATIC_LOCAL(CompositorWorkerSharedState, compositorWorkerSharedState, (new CompositorWorkerSharedState())); return compositorWorkerSharedState; } diff --git a/third_party/WebKit/Source/modules/webdatabase/Database.cpp b/third_party/WebKit/Source/modules/webdatabase/Database.cpp index ac3f475..e2139e5 100644 --- a/third_party/WebKit/Source/modules/webdatabase/Database.cpp +++ b/third_party/WebKit/Source/modules/webdatabase/Database.cpp @@ -149,7 +149,7 @@ static bool setTextValueInDatabase(SQLiteDatabase& db, const String& query, cons // FIXME: move all guid-related functions to a DatabaseVersionTracker class. static RecursiveMutex& guidMutex() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(RecursiveMutex, mutex, new RecursiveMutex); + DEFINE_THREAD_SAFE_STATIC_LOCAL(RecursiveMutex, mutex, new RecursiveMutex); return mutex; } diff --git a/third_party/WebKit/Source/modules/webdatabase/DatabaseTracker.cpp b/third_party/WebKit/Source/modules/webdatabase/DatabaseTracker.cpp index 53304ea..856fea4 100644 --- a/third_party/WebKit/Source/modules/webdatabase/DatabaseTracker.cpp +++ b/third_party/WebKit/Source/modules/webdatabase/DatabaseTracker.cpp @@ -60,7 +60,7 @@ static void databaseClosed(Database* database) DatabaseTracker& DatabaseTracker::tracker() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(DatabaseTracker, tracker, new DatabaseTracker); + DEFINE_THREAD_SAFE_STATIC_LOCAL(DatabaseTracker, tracker, new DatabaseTracker); return tracker; } diff --git a/third_party/WebKit/Source/modules/webdatabase/QuotaTracker.cpp b/third_party/WebKit/Source/modules/webdatabase/QuotaTracker.cpp index 490484e..548dbe4 100644 --- a/third_party/WebKit/Source/modules/webdatabase/QuotaTracker.cpp +++ b/third_party/WebKit/Source/modules/webdatabase/QuotaTracker.cpp @@ -39,7 +39,7 @@ namespace blink { QuotaTracker& QuotaTracker::instance() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(QuotaTracker, tracker, new QuotaTracker); + DEFINE_THREAD_SAFE_STATIC_LOCAL(QuotaTracker, tracker, new QuotaTracker); return tracker; } diff --git a/third_party/WebKit/Source/platform/audio/HRTFElevation.cpp b/third_party/WebKit/Source/platform/audio/HRTFElevation.cpp index 4626dac..13b1d31 100644 --- a/third_party/WebKit/Source/platform/audio/HRTFElevation.cpp +++ b/third_party/WebKit/Source/platform/audio/HRTFElevation.cpp @@ -70,8 +70,8 @@ const int ElevationIndexTable[ElevationIndexTableSize] = { static PassRefPtr<AudioBus> getConcatenatedImpulseResponsesForSubject(const String& subjectName) { typedef HashMap<String, RefPtr<AudioBus>> AudioBusMap; - DEFINE_STATIC_LOCAL_THREAD_SAFE(AudioBusMap, audioBusMap, new AudioBusMap()); - DEFINE_STATIC_LOCAL_THREAD_SAFE(Mutex, mutex, new Mutex()); + DEFINE_THREAD_SAFE_STATIC_LOCAL(AudioBusMap, audioBusMap, new AudioBusMap()); + DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mutex, new Mutex()); MutexLocker locker(mutex); RefPtr<AudioBus> bus; diff --git a/third_party/WebKit/Source/platform/blob/BlobRegistry.cpp b/third_party/WebKit/Source/platform/blob/BlobRegistry.cpp index 48ad913..bbce70b 100644 --- a/third_party/WebKit/Source/platform/blob/BlobRegistry.cpp +++ b/third_party/WebKit/Source/platform/blob/BlobRegistry.cpp @@ -67,10 +67,10 @@ typedef HashMap<String, RefPtr<SecurityOrigin>> BlobURLOriginMap; static ThreadSpecific<BlobURLOriginMap>& originMap() { // We want to create the BlobOriginCache exactly once because it is shared by all the threads. - DEFINE_STATIC_LOCAL_THREAD_SAFE(BlobOriginCache, cache, new BlobOriginCache); + DEFINE_THREAD_SAFE_STATIC_LOCAL(BlobOriginCache, cache, new BlobOriginCache); (void)cache; // BlobOriginCache's constructor does the interesting work. - DEFINE_STATIC_LOCAL_THREAD_SAFE(ThreadSpecific<BlobURLOriginMap>, map, new ThreadSpecific<BlobURLOriginMap>); + DEFINE_THREAD_SAFE_STATIC_LOCAL(ThreadSpecific<BlobURLOriginMap>, map, new ThreadSpecific<BlobURLOriginMap>); return map; } diff --git a/third_party/WebKit/Source/platform/fonts/ScriptRunIterator.cpp b/third_party/WebKit/Source/platform/fonts/ScriptRunIterator.cpp index 2e9c53c..2680fb9 100644 --- a/third_party/WebKit/Source/platform/fonts/ScriptRunIterator.cpp +++ b/third_party/WebKit/Source/platform/fonts/ScriptRunIterator.cpp @@ -112,7 +112,7 @@ PairedBracketType ICUScriptData::getPairedBracketType(UChar32 ch) const const ICUScriptData* ICUScriptData::instance() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const ICUScriptData, icuScriptDataInstance, (new ICUScriptData())); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const ICUScriptData, icuScriptDataInstance, (new ICUScriptData())); return &icuScriptDataInstance; } diff --git a/third_party/WebKit/Source/platform/fonts/ScriptRunIteratorTest.cpp b/third_party/WebKit/Source/platform/fonts/ScriptRunIteratorTest.cpp index aa08594..8dee5fe 100644 --- a/third_party/WebKit/Source/platform/fonts/ScriptRunIteratorTest.cpp +++ b/third_party/WebKit/Source/platform/fonts/ScriptRunIteratorTest.cpp @@ -35,7 +35,7 @@ public: static const MockScriptData* instance() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const MockScriptData, mockScriptData, (new MockScriptData())); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const MockScriptData, mockScriptData, (new MockScriptData())); return &mockScriptData; } diff --git a/third_party/WebKit/Source/platform/graphics/ImageDecodingStore.cpp b/third_party/WebKit/Source/platform/graphics/ImageDecodingStore.cpp index e41d8a7..57db466 100644 --- a/third_party/WebKit/Source/platform/graphics/ImageDecodingStore.cpp +++ b/third_party/WebKit/Source/platform/graphics/ImageDecodingStore.cpp @@ -54,7 +54,7 @@ ImageDecodingStore::~ImageDecodingStore() ImageDecodingStore& ImageDecodingStore::instance() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(ImageDecodingStore, store, ImageDecodingStore::create().leakPtr()); + DEFINE_THREAD_SAFE_STATIC_LOCAL(ImageDecodingStore, store, ImageDecodingStore::create().leakPtr()); return store; } diff --git a/third_party/WebKit/Source/platform/heap/GCInfo.cpp b/third_party/WebKit/Source/platform/heap/GCInfo.cpp index a083714..d97508d 100644 --- a/third_party/WebKit/Source/platform/heap/GCInfo.cpp +++ b/third_party/WebKit/Source/platform/heap/GCInfo.cpp @@ -21,7 +21,7 @@ void GCInfoTable::ensureGCInfoIndex(const GCInfo* gcInfo, size_t* gcInfoIndexSlo ASSERT(gcInfo); ASSERT(gcInfoIndexSlot); // Keep a global GCInfoTable lock while allocating a new slot. - DEFINE_STATIC_LOCAL_THREAD_SAFE(Mutex, mutex, new Mutex); + DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mutex, new Mutex); MutexLocker locker(mutex); // If more than one thread ends up allocating a slot for diff --git a/third_party/WebKit/Source/platform/heap/Heap.cpp b/third_party/WebKit/Source/platform/heap/Heap.cpp index 7515f9d..1b27d1e 100644 --- a/third_party/WebKit/Source/platform/heap/Heap.cpp +++ b/third_party/WebKit/Source/platform/heap/Heap.cpp @@ -654,7 +654,7 @@ BasePage* Heap::lookup(Address address) static Mutex& regionTreeMutex() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(Mutex, mutex, new Mutex); + DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mutex, new Mutex); return mutex; } diff --git a/third_party/WebKit/Source/platform/heap/HeapTest.cpp b/third_party/WebKit/Source/platform/heap/HeapTest.cpp index f8cc26d..22bceda 100644 --- a/third_party/WebKit/Source/platform/heap/HeapTest.cpp +++ b/third_party/WebKit/Source/platform/heap/HeapTest.cpp @@ -5319,13 +5319,13 @@ TEST(HeapTest, IndirectStrongToWeak) static Mutex& mainThreadMutex() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(Mutex, mainMutex, new Mutex); + DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mainMutex, new Mutex); return mainMutex; } static ThreadCondition& mainThreadCondition() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(ThreadCondition, mainCondition, new ThreadCondition); + DEFINE_THREAD_SAFE_STATIC_LOCAL(ThreadCondition, mainCondition, new ThreadCondition); return mainCondition; } @@ -5342,13 +5342,13 @@ static void wakeMainThread() static Mutex& workerThreadMutex() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(Mutex, workerMutex, new Mutex); + DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, workerMutex, new Mutex); return workerMutex; } static ThreadCondition& workerThreadCondition() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(ThreadCondition, workerCondition, new ThreadCondition); + DEFINE_THREAD_SAFE_STATIC_LOCAL(ThreadCondition, workerCondition, new ThreadCondition); return workerCondition; } @@ -5643,7 +5643,7 @@ TEST(HeapTest, GarbageCollectionDuringMixinConstruction) static RecursiveMutex& recursiveMutex() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(RecursiveMutex, recursiveMutex, new RecursiveMutex); + DEFINE_THREAD_SAFE_STATIC_LOCAL(RecursiveMutex, recursiveMutex, new RecursiveMutex); return recursiveMutex; } diff --git a/third_party/WebKit/Source/platform/heap/ThreadState.cpp b/third_party/WebKit/Source/platform/heap/ThreadState.cpp index ab8f4e7..4b07285 100644 --- a/third_party/WebKit/Source/platform/heap/ThreadState.cpp +++ b/third_party/WebKit/Source/platform/heap/ThreadState.cpp @@ -74,7 +74,7 @@ SafePointBarrier* ThreadState::s_safePointBarrier = nullptr; RecursiveMutex& ThreadState::threadAttachMutex() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(RecursiveMutex, mutex, (new RecursiveMutex)); + DEFINE_THREAD_SAFE_STATIC_LOCAL(RecursiveMutex, mutex, (new RecursiveMutex)); return mutex; } @@ -493,7 +493,7 @@ void ThreadState::threadLocalWeakProcessing() CrossThreadPersistentRegion& ThreadState::crossThreadPersistentRegion() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(CrossThreadPersistentRegion, persistentRegion, new CrossThreadPersistentRegion()); + DEFINE_THREAD_SAFE_STATIC_LOCAL(CrossThreadPersistentRegion, persistentRegion, new CrossThreadPersistentRegion()); return persistentRegion; } diff --git a/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.h b/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.h index 69a73f7..2ebd779 100644 --- a/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.h +++ b/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.h @@ -255,7 +255,7 @@ public: static qcms_profile* qcmsOutputDeviceProfile() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(OutputDeviceProfile, outputDeviceProfile, new OutputDeviceProfile); + DEFINE_THREAD_SAFE_STATIC_LOCAL(OutputDeviceProfile, outputDeviceProfile, new OutputDeviceProfile); return outputDeviceProfile.profile(); } diff --git a/third_party/WebKit/Source/wtf/Assertions.cpp b/third_party/WebKit/Source/wtf/Assertions.cpp index 2ce03fb..d72aa69 100644 --- a/third_party/WebKit/Source/wtf/Assertions.cpp +++ b/third_party/WebKit/Source/wtf/Assertions.cpp @@ -357,7 +357,7 @@ void ScopedLogger::print(const char* format, ...) ScopedLogger*& ScopedLogger::current() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(ThreadSpecific<ScopedLogger*>, ref, new ThreadSpecific<ScopedLogger*>); + DEFINE_THREAD_SAFE_STATIC_LOCAL(ThreadSpecific<ScopedLogger*>, ref, new ThreadSpecific<ScopedLogger*>); return *ref; } diff --git a/third_party/WebKit/Source/wtf/HashTable.cpp b/third_party/WebKit/Source/wtf/HashTable.cpp index 4574c13..1b5eed2 100644 --- a/third_party/WebKit/Source/wtf/HashTable.cpp +++ b/third_party/WebKit/Source/wtf/HashTable.cpp @@ -35,7 +35,7 @@ int HashTableStats::numReinserts; static Mutex& hashTableStatsMutex() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(Mutex, mutex, new Mutex); + DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mutex, new Mutex); return mutex; } diff --git a/third_party/WebKit/Source/wtf/Threading.h b/third_party/WebKit/Source/wtf/Threading.h index ddcc436..f8555f2 100644 --- a/third_party/WebKit/Source/wtf/Threading.h +++ b/third_party/WebKit/Source/wtf/Threading.h @@ -39,7 +39,7 @@ // by some toolchains. Make use of double-checked locking to reduce overhead. // Note that this uses system-wide default lock, and cannot be used before // WTF::initializeThreading() is called. -#define DEFINE_STATIC_LOCAL_THREAD_SAFE(T, name, initializer) \ +#define DEFINE_THREAD_SAFE_STATIC_LOCAL(T, name, initializer) \ /* Init to nullptr is thread-safe on all implementations. */ \ static void* name##Pointer = nullptr; \ if (!WTF::acquireLoad(&name##Pointer)) { \ diff --git a/third_party/WebKit/Source/wtf/text/TextEncoding.cpp b/third_party/WebKit/Source/wtf/text/TextEncoding.cpp index a6c07df..f3f231d 100644 --- a/third_party/WebKit/Source/wtf/text/TextEncoding.cpp +++ b/third_party/WebKit/Source/wtf/text/TextEncoding.cpp @@ -38,7 +38,7 @@ namespace WTF { static const TextEncoding& UTF7Encoding() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const TextEncoding, globalUTF7Encoding, new TextEncoding("UTF-7")); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const TextEncoding, globalUTF7Encoding, new TextEncoding("UTF-7")); return globalUTF7Encoding; } @@ -134,50 +134,50 @@ const TextEncoding& TextEncoding::encodingForFormSubmission() const const TextEncoding& ASCIIEncoding() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const TextEncoding, globalASCIIEncoding, new TextEncoding("ASCII")); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const TextEncoding, globalASCIIEncoding, new TextEncoding("ASCII")); return globalASCIIEncoding; } const TextEncoding& Latin1Encoding() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const TextEncoding, globalLatin1Encoding, new TextEncoding("latin1")); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const TextEncoding, globalLatin1Encoding, new TextEncoding("latin1")); return globalLatin1Encoding; } const TextEncoding& UTF16BigEndianEncoding() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const TextEncoding, globalUTF16BigEndianEncoding, new TextEncoding("UTF-16BE")); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const TextEncoding, globalUTF16BigEndianEncoding, new TextEncoding("UTF-16BE")); return globalUTF16BigEndianEncoding; } const TextEncoding& UTF16LittleEndianEncoding() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const TextEncoding, globalUTF16LittleEndianEncoding, new TextEncoding("UTF-16LE")); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const TextEncoding, globalUTF16LittleEndianEncoding, new TextEncoding("UTF-16LE")); return globalUTF16LittleEndianEncoding; } const TextEncoding& UTF32BigEndianEncoding() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const TextEncoding, globalUTF32BigEndianEncoding, new TextEncoding("UTF-32BE")); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const TextEncoding, globalUTF32BigEndianEncoding, new TextEncoding("UTF-32BE")); return globalUTF32BigEndianEncoding; } const TextEncoding& UTF32LittleEndianEncoding() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const TextEncoding, globalUTF32LittleEndianEncoding, new TextEncoding("UTF-32LE")); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const TextEncoding, globalUTF32LittleEndianEncoding, new TextEncoding("UTF-32LE")); return globalUTF32LittleEndianEncoding; } const TextEncoding& UTF8Encoding() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const TextEncoding, globalUTF8Encoding, new TextEncoding("UTF-8")); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const TextEncoding, globalUTF8Encoding, new TextEncoding("UTF-8")); ASSERT(globalUTF8Encoding.isValid()); return globalUTF8Encoding; } const TextEncoding& WindowsLatin1Encoding() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(const TextEncoding, globalWindowsLatin1Encoding, new TextEncoding("WinLatin1")); + DEFINE_THREAD_SAFE_STATIC_LOCAL(const TextEncoding, globalWindowsLatin1Encoding, new TextEncoding("WinLatin1")); return globalWindowsLatin1Encoding; } diff --git a/third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp b/third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp index 19025c3..c85fe06 100644 --- a/third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp +++ b/third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp @@ -43,7 +43,7 @@ static UCollator* cachedCollator; static char cachedEquivalentLocale[Collator::ulocFullnameCapacity]; static Mutex& cachedCollatorMutex() { - DEFINE_STATIC_LOCAL_THREAD_SAFE(Mutex, mutex, new Mutex); + DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mutex, new Mutex); return mutex; } |