Revert of Oilpan: Rename heap classes

Source/platform/heap/ThreadState.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 33 matching lines @@
 #include "wtf/Vector.h"
 #include "wtf/text/StringHash.h"
 #include "wtf/text/WTFString.h"
 
 namespace v8 {
 class Isolate;
 };
 
 namespace blink {
 
-class BasePage;
+class BaseHeapPage;
 class CallbackStack;
 struct GCInfo;
 class HeapObjectHeader;
 class PageMemoryRegion;
 class PageMemory;
 class PersistentNode;
 class SafePointBarrier;
 class SafePointAwareMutexLocker;
-class BaseHeap;
+class ThreadHeap;
 class ThreadState;
 class Visitor;
 
 using Address = uint8_t*;
 
 using FinalizationCallback = void (*)(void*);
 using VisitorCallback = void (*)(Visitor*, void* self);
 using TraceCallback = VisitorCallback;
 using WeakPointerCallback = VisitorCallback;
 using EphemeronCallback = VisitorCallback;
@@ skipping 98 matching lines @@
 // of typed heap related methods.
 //
 // To create a new typed heap add a H(<ClassName>) to the
 // FOR_EACH_TYPED_HEAP macro below.
 #define FOR_EACH_TYPED_HEAP(H)              \
     H(Node)                                 \
     H(CSSValue)
 
 #define TypedHeapEnumName(Type) Type##Heap,
 
-enum HeapIndices {
-    NormalPageHeapIndex = 0,
-    VectorHeapIndex,
-    InlineVectorHeapIndex,
-    HashTableHeapIndex,
+enum TypedHeaps {
+    GeneralHeap = 0,
+    VectorBackingHeap,
+    InlineVectorBackingHeap,
+    HashTableBackingHeap,
     FOR_EACH_TYPED_HEAP(TypedHeapEnumName)
-    LargeObjectHeapIndex,
+    LargeObjectHeap,
     // Values used for iteration of heap segments.
     NumberOfHeaps,
 };
 
 #if ENABLE(GC_PROFILING)
 const size_t numberOfGenerationsToTrack = 8;
 const size_t maxHeapObjectAge = numberOfGenerationsToTrack - 1;
 
 struct AgeCounts {
     int ages[numberOfGenerationsToTrack];
@@ skipping 275 matching lines @@
     void recordStackEnd(intptr_t* endOfStack)
     {
         m_endOfStack = endOfStack;
     }
 
     // Get one of the heap structures for this thread.
     //
     // The heap is split into multiple heap parts based on object
     // types. To get the index for a given type, use
     // HeapIndexTrait<Type>::index.
-    BaseHeap* heap(int heapIndex) const { return m_heaps[heapIndex]; }
+    ThreadHeap* heap(int heapIndex) const { return m_heaps[heapIndex]; }
 
 #if ENABLE(ASSERT) || ENABLE(GC_PROFILING)
     // Infrastructure to determine if an address is within one of the
     // address ranges for the Blink heap. If the address is in the Blink
     // heap the containing heap page is returned.
-    BasePage* findPageFromAddress(Address);
-    BasePage* findPageFromAddress(void* pointer) { return findPageFromAddress(reinterpret_cast<Address>(pointer)); }
+    BaseHeapPage* findPageFromAddress(Address);
+    BaseHeapPage* findPageFromAddress(void* pointer) { return findPageFromAddress(reinterpret_cast<Address>(pointer)); }
 #endif
 
     // List of persistent roots allocated on the given thread.
     PersistentNode* roots() const { return m_persistents.get(); }
 
     // List of global persistent roots not owned by any particular thread.
     // globalRootsMutex must be acquired before any modifications.
     static PersistentNode& globalRoots();
     static Mutex& globalRootsMutex();
 
@@ skipping 157 matching lines @@
     intptr_t* m_endOfStack;
     void* m_safePointScopeMarker;
     Vector<Address> m_safePointStackCopy;
     bool m_atSafePoint;
     Vector<Interruptor*> m_interruptors;
     bool m_hasPendingIdleTask;
     bool m_didV8GCAfterLastGC;
     bool m_sweepForbidden;
     size_t m_noAllocationCount;
     size_t m_allocatedObjectSizeBeforeGC;
-    BaseHeap* m_heaps[NumberOfHeaps];
+    ThreadHeap* m_heaps[NumberOfHeaps];
 
     Vector<OwnPtr<CleanupTask>> m_cleanupTasks;
     bool m_isTerminating;
 
     bool m_shouldFlushHeapDoesNotContainCache;
     double m_collectionRate;
     GCState m_gcState;
 
     CallbackStack* m_weakCallbackStack;
     HashMap<void*, bool (*)(void*, Visitor&)> m_preFinalizers;
@@ skipping 80 matching lines @@
         m_locked = false;
     }
 
     MutexBase& m_mutex;
     bool m_locked;
 };
 
 } // namespace blink
 
 #endif // ThreadState_h