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 6f4f4e723f48ab675ab24bb7c2c11af92c8b974a..17fd25c0580bcfecb6d969e94c61f2499e4ab987 100644
--- a/third_party/WebKit/Source/platform/heap/BlinkGCMemoryDumpProvider.cpp
+++ b/third_party/WebKit/Source/platform/heap/BlinkGCMemoryDumpProvider.cpp
@@ -18,14 +18,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", ThreadState::current()->gcGroup()->heapStats().allocatedSpace());

[haraken, 2016/01/28 15:52:48]

I think allocatedSpace should be a member of Heap, not a member of GCGroup.

[keishi, 2016/02/29 06:02:32]

Used Heap::totalAllocatedSpace

 
     dumpName.append("/allocated_objects");
     WebMemoryAllocatorDump* objectsDump = memoryDump->createMemoryAllocatorDump(dumpName);
 
     // Heap::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", Heap::totalAllocatedObjectSize() + Heap::totalMarkedObjectSize());
 }
 
 } // namespace