Revert of Rename Heap to ThreadHeap

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", ProcessHeap::totalAllocatedSpace());
 
     dumpName.append("/allocated_objects");
     WebMemoryAllocatorDump* objectsDump = memoryDump->createMemoryAllocatorDump(dumpName);
 
-    // ThreadHeap::markedObjectSize() can be underestimated if we're still in the
+    // Heap::markedObjectSize() can be underestimated if we're still in the
     // process of lazy sweeping.
     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)
@@ skipping 11 matching lines @@
 
 BlinkGCMemoryDumpProvider::~BlinkGCMemoryDumpProvider()
 {
 }
 
 bool BlinkGCMemoryDumpProvider::onMemoryDump(WebMemoryDumpLevelOfDetail levelOfDetail, blink::WebProcessMemoryDump* memoryDump)
 {
     // In the case of a detailed dump perform a mark-only GC pass to collect
     // more detailed stats.
     if (levelOfDetail == WebMemoryDumpLevelOfDetail::Detailed)
-        ThreadHeap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::TakeSnapshot, BlinkGC::ForcedGC);
+        Heap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::TakeSnapshot, BlinkGC::ForcedGC);
     dumpMemoryTotals(memoryDump);
 
     if (m_isHeapProfilingEnabled) {
         // Overhead should always be reported, regardless of light vs. heavy.
         base::trace_event::TraceEventMemoryOverhead overhead;
         base::hash_map<base::trace_event::AllocationContext, size_t> bytesByContext;
         {
             MutexLocker locker(m_allocationRegisterMutex);
             if (levelOfDetail == WebMemoryDumpLevelOfDetail::Detailed) {
                 for (const auto& allocSize : *m_allocationRegister)
                     bytesByContext[allocSize.context] += allocSize.size;
             }
             m_allocationRegister->EstimateTraceMemoryOverhead(&overhead);
         }
         memoryDump->dumpHeapUsage(bytesByContext, overhead, "blink_gc");
     }
 
-    // Merge all dumps collected by ThreadHeap::collectGarbage.
+    // Merge all dumps collected by Heap::collectGarbage.
     if (levelOfDetail == WebMemoryDumpLevelOfDetail::Detailed)
         memoryDump->takeAllDumpsFrom(m_currentProcessMemoryDump.get());
     return true;
 }
 
 void BlinkGCMemoryDumpProvider::onHeapProfilingEnabled(bool enabled)
 {
     if (enabled) {
         {
             MutexLocker locker(m_allocationRegisterMutex);
@@ skipping 35 matching lines @@
 }
 
 void BlinkGCMemoryDumpProvider::remove(Address address)
 {
     MutexLocker locker(m_allocationRegisterMutex);
     if (m_allocationRegister)
         m_allocationRegister->Remove(address);
 }
 
 } // namespace blink