| Index: Source/platform/heap/Heap.h
|
| diff --git a/Source/platform/heap/Heap.h b/Source/platform/heap/Heap.h
|
| index aaa91892dcebc1b96df3b475168c9c0a5cf7998f..c5d4225baf21da1ce19914d151d3085d8b18f0bf 100644
|
| --- a/Source/platform/heap/Heap.h
|
| +++ b/Source/platform/heap/Heap.h
|
| @@ -1550,14 +1550,14 @@ public:
|
| static void enterNoAllocationScope()
|
| {
|
| #if ENABLE(ASSERT)
|
| - ThreadStateFor<AnyThread>::state()->enterNoAllocationScope();
|
| + ThreadStateFor<AnyThreadAffinity>::state()->enterNoAllocationScope();
|
| #endif
|
| }
|
|
|
| static void leaveNoAllocationScope()
|
| {
|
| #if ENABLE(ASSERT)
|
| - ThreadStateFor<AnyThread>::state()->leaveNoAllocationScope();
|
| + ThreadStateFor<AnyThreadAffinity>::state()->leaveNoAllocationScope();
|
| #endif
|
| }
|
|
|
| @@ -1761,15 +1761,15 @@ struct ThreadingTrait<WeakMember<T> > {
|
| template<typename Key, typename Value, typename T, typename U, typename V>
|
| struct ThreadingTrait<HashMap<Key, Value, T, U, V, HeapAllocator> > {
|
| static const ThreadAffinity Affinity =
|
| - (ThreadingTrait<Key>::Affinity == MainThreadOnly)
|
| - && (ThreadingTrait<Value>::Affinity == MainThreadOnly) ? MainThreadOnly : AnyThread;
|
| + (ThreadingTrait<Key>::Affinity == MainThreadAffinity)
|
| + && (ThreadingTrait<Value>::Affinity == MainThreadAffinity) ? MainThreadAffinity : AnyThreadAffinity;
|
| };
|
|
|
| template<typename First, typename Second>
|
| struct ThreadingTrait<WTF::KeyValuePair<First, Second> > {
|
| static const ThreadAffinity Affinity =
|
| - (ThreadingTrait<First>::Affinity == MainThreadOnly)
|
| - && (ThreadingTrait<Second>::Affinity == MainThreadOnly) ? MainThreadOnly : AnyThread;
|
| + (ThreadingTrait<First>::Affinity == MainThreadAffinity)
|
| + && (ThreadingTrait<Second>::Affinity == MainThreadAffinity) ? MainThreadAffinity : AnyThreadAffinity;
|
| };
|
|
|
| template<typename T, typename U, typename V>
|
| @@ -1803,8 +1803,8 @@ struct ThreadingTrait<HeapHashTableBacking<Table> > {
|
| typedef typename Table::KeyType Key;
|
| typedef typename Table::ValueType Value;
|
| static const ThreadAffinity Affinity =
|
| - (ThreadingTrait<Key>::Affinity == MainThreadOnly)
|
| - && (ThreadingTrait<Value>::Affinity == MainThreadOnly) ? MainThreadOnly : AnyThread;
|
| + (ThreadingTrait<Key>::Affinity == MainThreadAffinity)
|
| + && (ThreadingTrait<Value>::Affinity == MainThreadAffinity) ? MainThreadAffinity : AnyThreadAffinity;
|
| };
|
|
|
| template<typename T, typename U, typename V, typename W, typename X>
|
|
|