Refactor the Heap into ThreadHeap to prepare for per thread heaps

third_party/WebKit/Source/platform/heap/PagePool.cpp

Index: third_party/WebKit/Source/platform/heap/PagePool.cpp
diff --git a/third_party/WebKit/Source/platform/heap/PagePool.cpp b/third_party/WebKit/Source/platform/heap/PagePool.cpp
index 9bda5c0d1eb8983ef3ff5e744cb9a90547385e20..7878a786104befde44da4bf2deccac7b3ce39ed1 100644
--- a/third_party/WebKit/Source/platform/heap/PagePool.cpp
+++ b/third_party/WebKit/Source/platform/heap/PagePool.cpp
@@ -12,7 +12,7 @@ namespace blink {
 
 FreePagePool::~FreePagePool()
 {
-    for (int index = 0; index < BlinkGC::NumberOfHeaps; ++index) {
+    for (int index = 0; index < BlinkGC::NumberOfArenas; ++index) {
         while (PoolEntry* entry = m_pool[index]) {
             m_pool[index] = entry->next;
             PageMemory* memory = entry->data;
@@ -53,7 +53,7 @@ PageMemory* FreePagePool::takeFreePage(int index)
 
 OrphanedPagePool::~OrphanedPagePool()
 {
-    for (int index = 0; index < BlinkGC::NumberOfHeaps; ++index) {
+    for (int index = 0; index < BlinkGC::NumberOfArenas; ++index) {
         while (PoolEntry* entry = m_pool[index]) {
             m_pool[index] = entry->next;
             BasePage* page = entry->data;
@@ -80,11 +80,10 @@ void OrphanedPagePool::decommitOrphanedPages()
 
 #if ENABLE(ASSERT)
     // No locking needed as all threads are at safepoints at this point in time.
-    for (ThreadState* state : ThreadState::attachedThreads())
-        ASSERT(state->isAtSafePoint());
+    ASSERT(ThreadState::mainThreadState()->heap().isAtSafePoint());
 #endif
 
-    for (int index = 0; index < BlinkGC::NumberOfHeaps; ++index) {
+    for (int index = 0; index < BlinkGC::NumberOfArenas; ++index) {
         PoolEntry* entry = m_pool[index];
         PoolEntry** prevNext = &m_pool[index];
         while (entry) {
@@ -101,7 +100,7 @@ void OrphanedPagePool::decommitOrphanedPages()
             } else {
                 page->~BasePage();
                 clearMemory(memory);
-                Heap::freePagePool()->addFreePage(index, memory);
+                ThreadState::current()->heap().freePagePool()->addFreePage(index, memory);

[haraken, 2016/02/29 11:17:45]

ThreadState::current() => ThreadState::mainThreadState()).

[keishi, 2016/03/02 06:01:03]

Done.

             }
 
             PoolEntry* deadEntry = entry;
@@ -139,7 +138,7 @@ void OrphanedPagePool::clearMemory(PageMemory* memory)
 #if ENABLE(ASSERT)
 bool OrphanedPagePool::contains(void* object)
 {
-    for (int index = 0; index < BlinkGC::NumberOfHeaps; ++index) {
+    for (int index = 0; index < BlinkGC::NumberOfArenas; ++index) {
         for (PoolEntry* entry = m_pool[index]; entry; entry = entry->next) {
             BasePage* page = entry->data;
             if (page->contains(reinterpret_cast<Address>(object)))