| Index: third_party/WebKit/Source/platform/heap/Heap.h
|
| diff --git a/third_party/WebKit/Source/platform/heap/Heap.h b/third_party/WebKit/Source/platform/heap/Heap.h
|
| index ee57a324aee318afc884f8d5a87f278b680c00b8..74503ccbe99d7fbb84cf52714a68b6bd4d7d5f88 100644
|
| --- a/third_party/WebKit/Source/platform/heap/Heap.h
|
| +++ b/third_party/WebKit/Source/platform/heap/Heap.h
|
| @@ -220,11 +220,9 @@ class ThreadHeapStats {
|
| double m_estimatedMarkingTimePerByte;
|
| };
|
|
|
| -using ThreadStateSet = HashSet<ThreadState*>;
|
| -
|
| class PLATFORM_EXPORT ThreadHeap {
|
| public:
|
| - ThreadHeap();
|
| + explicit ThreadHeap(ThreadState*);
|
| ~ThreadHeap();
|
|
|
| // Returns true for main thread's heap.
|
| @@ -271,8 +269,6 @@ class PLATFORM_EXPORT ThreadHeap {
|
|
|
| StackFrameDepth& stackFrameDepth() { return m_stackFrameDepth; }
|
|
|
| - RecursiveMutex& threadAttachMutex() { return m_threadAttachMutex; }
|
| - const ThreadStateSet& threads() const { return m_threads; }
|
| ThreadHeapStats& heapStats() { return m_stats; }
|
| SafePointBarrier* safePointBarrier() { return m_safePointBarrier.get(); }
|
| CallbackStack* markingStack() const { return m_markingStack.get(); }
|
| @@ -284,11 +280,6 @@ class PLATFORM_EXPORT ThreadHeap {
|
| }
|
| CallbackStack* ephemeronStack() const { return m_ephemeronStack.get(); }
|
|
|
| - void attach(ThreadState*);
|
| - void detach(ThreadState*);
|
| - void lockThreadAttachMutex();
|
| - void unlockThreadAttachMutex();
|
| -
|
| void visitPersistentRoots(Visitor*);
|
| void visitStackRoots(Visitor*);
|
| void enterSafePoint(ThreadState*);
|
| @@ -459,8 +450,7 @@ class PLATFORM_EXPORT ThreadHeap {
|
| void commitCallbackStacks();
|
| void decommitCallbackStacks();
|
|
|
| - RecursiveMutex m_threadAttachMutex;
|
| - ThreadStateSet m_threads;
|
| + ThreadState* m_threadState;
|
| ThreadHeapStats m_stats;
|
| std::unique_ptr<RegionTree> m_regionTree;
|
| std::unique_ptr<HeapDoesNotContainCache> m_heapDoesNotContainCache;
|
|
|