Refactor the Heap into ThreadHeap to prepare for per thread heaps

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

Index: third_party/WebKit/Source/platform/heap/BlinkGCMemoryDumpProvider.cpp
diff --git a/third_party/WebKit/Source/platform/heap/BlinkGCMemoryDumpProvider.cpp b/third_party/WebKit/Source/platform/heap/BlinkGCMemoryDumpProvider.cpp
index 73c78c7bf4bc474d16c951bd7f1dbc46b68b7575..adc5ebaf7cb2cd327b06063a8107ea16d6023d80 100644
--- a/third_party/WebKit/Source/platform/heap/BlinkGCMemoryDumpProvider.cpp
+++ b/third_party/WebKit/Source/platform/heap/BlinkGCMemoryDumpProvider.cpp
@@ -21,14 +21,14 @@ void dumpMemoryTotals(blink::WebProcessMemoryDump* memoryDump)
 {
     String dumpName = String::format("blink_gc");
     WebMemoryAllocatorDump* allocatorDump = memoryDump->createMemoryAllocatorDump(dumpName);
-    allocatorDump->addScalar("size", "bytes", Heap::allocatedSpace());
+    allocatorDump->addScalar("size", "bytes", ProcessHeap::totalAllocatedSpace());
 
     dumpName.append("/allocated_objects");
     WebMemoryAllocatorDump* objectsDump = memoryDump->createMemoryAllocatorDump(dumpName);
 
-    // Heap::markedObjectSize() can be underestimated if we're still in the
+    // ThreadHeap::markedObjectSize() can be underestimated if we're still in the
     // process of lazy sweeping.
-    objectsDump->addScalar("size", "bytes", Heap::allocatedObjectSize() + Heap::markedObjectSize());
+    objectsDump->addScalar("size", "bytes", ProcessHeap::totalAllocatedObjectSize() + ProcessHeap::totalMarkedObjectSize());
 }
 
 void reportAllocation(Address address, size_t size, const char* typeName)
@@ -58,7 +58,7 @@ bool BlinkGCMemoryDumpProvider::onMemoryDump(WebMemoryDumpLevelOfDetail levelOfD
     // In the case of a detailed dump perform a mark-only GC pass to collect
     // more detailed stats.
     if (levelOfDetail == WebMemoryDumpLevelOfDetail::Detailed)
-        Heap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::TakeSnapshot, BlinkGC::ForcedGC);
+        ThreadHeap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::TakeSnapshot, BlinkGC::ForcedGC);
     dumpMemoryTotals(memoryDump);
 
     if (m_isHeapProfilingEnabled) {
@@ -76,7 +76,7 @@ bool BlinkGCMemoryDumpProvider::onMemoryDump(WebMemoryDumpLevelOfDetail levelOfD
         memoryDump->dumpHeapUsage(bytesByContext, overhead, "blink_gc");
     }
 
-    // Merge all dumps collected by Heap::collectGarbage.
+    // Merge all dumps collected by ThreadHeap::collectGarbage.
     if (levelOfDetail == WebMemoryDumpLevelOfDetail::Detailed)
         memoryDump->takeAllDumpsFrom(m_currentProcessMemoryDump.get());
     return true;