Introduce ProcessHeap

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/heap/BlinkGCMemoryDumpProvider.h"
 
 #include "base/trace_event/heap_profiler_allocation_context_tracker.h"
 #include "base/trace_event/heap_profiler_allocation_register.h"
 #include "base/trace_event/trace_event_memory_overhead.h"
 #include "platform/heap/Handle.h"
 #include "platform/web_process_memory_dump_impl.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebMemoryAllocatorDump.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/Threading.h"
 
 namespace blink {
 namespace {
 
 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
     // 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)
 {
     BlinkGCMemoryDumpProvider::instance()->insert(address, size, typeName);
 }
 
 void reportFree(Address address)
 {
     BlinkGCMemoryDumpProvider::instance()->remove(address);
@@ skipping 83 matching lines @@
 }
 
 void BlinkGCMemoryDumpProvider::remove(Address address)
 {
     MutexLocker locker(m_allocationRegisterMutex);
     if (m_allocationRegister)
         m_allocationRegister->Remove(address);
 }
 
 } // namespace blink