Refactor the Heap into ThreadHeap to prepare for per thread heaps

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

Index: third_party/WebKit/Source/platform/heap/PageMemory.h
diff --git a/third_party/WebKit/Source/platform/heap/PageMemory.h b/third_party/WebKit/Source/platform/heap/PageMemory.h
index 61b7038743f502188ed2a2fea67a378c927a6e85..6aad9fb6413d1916d181202d6b8375563604d793 100644
--- a/third_party/WebKit/Source/platform/heap/PageMemory.h
+++ b/third_party/WebKit/Source/platform/heap/PageMemory.h
@@ -77,14 +77,14 @@ public:
         m_inUse[index(page)] = false;
     }
 
-    static PageMemoryRegion* allocateLargePage(size_t size)
+    static PageMemoryRegion* allocateLargePage(size_t size, Heap* heap)
     {
-        return allocate(size, 1);
+        return allocate(size, 1, heap);
     }
 
-    static PageMemoryRegion* allocateNormalPages()
+    static PageMemoryRegion* allocateNormalPages(Heap* heap)
     {
-        return allocate(blinkPageSize * blinkPagesPerRegion, blinkPagesPerRegion);
+        return allocate(blinkPageSize * blinkPagesPerRegion, blinkPagesPerRegion, heap);
     }
 
     BasePage* pageFromAddress(Address address)
@@ -98,7 +98,7 @@ public:
     }
 
 private:
-    PageMemoryRegion(Address base, size_t, unsigned numPages);
+    PageMemoryRegion(Address base, size_t, unsigned numPages, Heap*);
 
     unsigned index(Address address)
     {
@@ -110,11 +110,12 @@ private:
         return offset / blinkPageSize;
     }
 
-    static PageMemoryRegion* allocate(size_t, unsigned numPages);
+    static PageMemoryRegion* allocate(size_t, unsigned numPages, Heap*);
 
     bool m_isLargePage;
     bool m_inUse[blinkPagesPerRegion];
     unsigned m_numPages;
+    Heap* m_heap;
 };
 
 // A RegionTree is a simple binary search tree of PageMemoryRegions sorted
@@ -143,8 +144,6 @@ private:
     PageMemoryRegion* m_region;
     RegionTree* m_left;
     RegionTree* m_right;
-
-    static RegionTree* s_regionTree;
 };
 
 // Representation of the memory used for a Blink heap page.
@@ -199,7 +198,7 @@ public:
     //
     // The returned page memory region will be zeroed.
     //
-    static PageMemory* allocate(size_t payloadSize);
+    static PageMemory* allocate(size_t payloadSize, Heap*);
 
 private:
     PageMemory(PageMemoryRegion* reserved, const MemoryRegion& writable);