Revert of Oilpan: Rename heap classes

Source/platform/heap/ThreadState.cpp

 /*
  * 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 287 matching lines @@
 {
     checkThread();
     ASSERT(!**s_threadSpecific);
     **s_threadSpecific = this;
 
     if (isMainThread()) {
         s_mainThreadStackStart = reinterpret_cast<uintptr_t>(m_startOfStack) - sizeof(void*);
         s_mainThreadUnderestimatedStackSize = StackFrameDepth::getUnderestimatedStackSize() - sizeof(void*);
     }
 
-    for (int heapIndex = 0; heapIndex < LargeObjectHeapIndex; heapIndex++)
-        m_heaps[heapIndex] = new NormalPageHeap(this, heapIndex);
-    m_heaps[LargeObjectHeapIndex] = new LargeObjectHeap(this, LargeObjectHeapIndex);
+    for (int heapIndex = 0; heapIndex < LargeObjectHeap; heapIndex++)
+        m_heaps[heapIndex] = new ThreadHeapForHeapPage(this, heapIndex);
+    m_heaps[LargeObjectHeap] = new ThreadHeapForLargeObject(this, LargeObjectHeap);
 
     m_weakCallbackStack = new CallbackStack();
 }
 
 ThreadState::~ThreadState()
 {
     checkThread();
     delete m_weakCallbackStack;
     m_weakCallbackStack = nullptr;
     for (int i = 0; i < NumberOfHeaps; ++i)
@@ skipping 242 matching lines @@
     m_persistents->trace(visitor);
     if (m_traceDOMWrappers) {
         TRACE_EVENT0("blink_gc", "V8GCController::traceDOMWrappers");
         m_traceDOMWrappers(m_isolate, visitor);
     }
 }
 
 #if ENABLE(GC_PROFILING)
 const GCInfo* ThreadState::findGCInfo(Address address)
 {
-    if (BasePage* page = findPageFromAddress(address))
+    if (BaseHeapPage* page = findPageFromAddress(address))
         return page->findGCInfo(address);
     return nullptr;
 }
 
 size_t ThreadState::SnapshotInfo::getClassTag(const GCInfo* gcInfo)
 {
     ClassTagMap::AddResult result = classTags.add(gcInfo, classTags.size());
     if (result.isNewEntry) {
         liveCount.append(0);
         deadCount.append(0);
@@ skipping 411 matching lines @@
 }
 
 void ThreadState::prepareHeapForTermination()
 {
     checkThread();
     for (int i = 0; i < NumberOfHeaps; ++i)
         m_heaps[i]->prepareHeapForTermination();
 }
 
 #if ENABLE(ASSERT) || ENABLE(GC_PROFILING)
-BasePage* ThreadState::findPageFromAddress(Address address)
+BaseHeapPage* ThreadState::findPageFromAddress(Address address)
 {
     for (int i = 0; i < NumberOfHeaps; ++i) {
-        if (BasePage* page = m_heaps[i]->findPageFromAddress(address))
+        if (BaseHeapPage* page = m_heaps[i]->findPageFromAddress(address))
             return page;
     }
     return nullptr;
 }
 #endif
 
 size_t ThreadState::objectPayloadSizeForTesting()
 {
     size_t objectPayloadSize = 0;
     for (int i = 0; i < NumberOfHeaps; ++i)
@@ skipping 294 matching lines @@
         json->beginArray(it->key.ascii().data());
         for (size_t age = 0; age <= maxHeapObjectAge; ++age)
             json->pushInteger(it->value.ages[age]);
         json->endArray();
     }
     TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(TRACE_DISABLED_BY_DEFAULT("blink_gc"), statsName, this, json.release());
 }
 #endif
 
 } // namespace blink