Remove ThreadHeap::m_threads

third_party/WebKit/Source/platform/heap/Heap.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 202 matching lines @@
   size_t m_objectSizeAtLastGC;
   size_t m_markedObjectSize;
   size_t m_markedObjectSizeAtLastCompleteSweep;
   size_t m_wrapperCount;
   size_t m_wrapperCountAtLastGC;
   size_t m_collectedWrapperCount;
   size_t m_partitionAllocSizeAtLastGC;
   double m_estimatedMarkingTimePerByte;
 };
 
-using ThreadStateSet = HashSet<ThreadState*>;
-
 class PLATFORM_EXPORT ThreadHeap {
  public:
-  ThreadHeap();
+  explicit ThreadHeap(ThreadState*);
   ~ThreadHeap();
 
   // Returns true for main thread's heap.
   // TODO(keishi): Per-thread-heap will return false.
   bool isMainThreadHeap() { return this == ThreadHeap::mainThreadHeap(); }
   static ThreadHeap* mainThreadHeap() { return s_mainThreadHeap; }
 
 #if DCHECK_IS_ON()
   bool isAtSafePoint();
   BasePage* findPageFromAddress(Address);
@@ skipping 26 matching lines @@
   static inline bool isHeapObjectAlive(const WeakMember<T>& member) {
     return isHeapObjectAlive(member.get());
   }
   template <typename T>
   static inline bool isHeapObjectAlive(const UntracedMember<T>& member) {
     return isHeapObjectAlive(member.get());
   }
 
   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(); }
   CallbackStack* postMarkingCallbackStack() const {
     return m_postMarkingCallbackStack.get();
   }
   CallbackStack* globalWeakCallbackStack() const {
     return m_globalWeakCallbackStack.get();
   }
   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*);
   void leaveSafePoint();
 
   static RecursiveMutex& allHeapsMutex();
   static HashSet<ThreadHeap*>& allHeaps();
 
   // Is the finalizable GC object still alive, but slated for lazy sweeping?
   // If a lazy sweep is in progress, returns true if the object was found
@@ skipping 150 matching lines @@
  private:
   // Reset counters that track live and allocated-since-last-GC sizes.
   void resetHeapCounters();
 
   static int arenaIndexForObjectSize(size_t);
   static bool isNormalArenaIndex(int);
 
   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;
   std::unique_ptr<SafePointBarrier> m_safePointBarrier;
   std::unique_ptr<PagePool> m_freePagePool;
   std::unique_ptr<CallbackStack> m_markingStack;
   std::unique_ptr<CallbackStack> m_postMarkingCallbackStack;
   std::unique_ptr<CallbackStack> m_globalWeakCallbackStack;
   std::unique_ptr<CallbackStack> m_ephemeronStack;
   BlinkGC::GCReason m_lastGCReason;
@@ skipping 209 matching lines @@
   T** cell = reinterpret_cast<T**>(object);
   if (*cell && !ObjectAliveTrait<T>::isHeapObjectAlive(*cell))
     *cell = nullptr;
 }
 
 }  // namespace blink
 
 #include "platform/heap/VisitorImpl.h"
 
 #endif  // Heap_h