Refactoring: Remove DETAILED_MEMORY_INFRA

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 1460 matching lines @@
 
 #undef SNAPSHOT_HEAP
 
     if (type == SnapshotType::FreelistSnapshot)
         return;
 
     size_t totalLiveCount = 0;
     size_t totalDeadCount = 0;
     size_t totalLiveSize = 0;
     size_t totalDeadSize = 0;
     for (size_t gcInfoIndex = 1; gcInfoIndex <= GCInfoTable::gcInfoIndex(); ++gcInfoIndex) {

[Primiano Tucci (use gerrit), 2016/02/19 10:04:51]

I wonder (for a next followup cl, not this one): if we know that we don't have
class-names, is it worth spamming the regular dumps with stuff like this?

https://imgur.com/n37JVaR

[hajimehoshi, 2016/02/19 10:32:03]

Hmm, this CL doesn't affect if the output is spammed, right? I don't think this
CL changed the dump names (except for type names).

[Primiano Tucci (use gerrit), 2016/02/19 11:11:52]

Right. I am just saying that now that we have the heap profiler, having a second
copy of the class list in the standard dump might be superfluous? WDYT?
In any case, nothing that belongs to this CL.

-        String dumpName = classesDumpName + String::format("/%lu_", static_cast<unsigned long>(gcInfoIndex));
-#if ENABLE(DETAILED_MEMORY_INFRA)
-        dumpName.append(Heap::gcInfo(gcInfoIndex)->className());
-#endif
+        const char* className = Heap::gcInfo(gcInfoIndex)->className();
+        String dumpName = classesDumpName + String::format("/%lu_%s", static_cast<unsigned long>(gcInfoIndex), className ? className : "");
         WebMemoryAllocatorDump* classDump = BlinkGCMemoryDumpProvider::instance()->createMemoryAllocatorDumpForCurrentGC(dumpName);
         classDump->addScalar("live_count", "objects", info.liveCount[gcInfoIndex]);
         classDump->addScalar("dead_count", "objects", info.deadCount[gcInfoIndex]);
         classDump->addScalar("live_size", "bytes", info.liveSize[gcInfoIndex]);
         classDump->addScalar("dead_size", "bytes", info.deadSize[gcInfoIndex]);
 
         totalLiveCount += info.liveCount[gcInfoIndex];
         totalDeadCount += info.deadCount[gcInfoIndex];
         totalLiveSize += info.liveSize[gcInfoIndex];
         totalDeadSize += info.deadSize[gcInfoIndex];
     }
 
     WebMemoryAllocatorDump* threadDump = BlinkGCMemoryDumpProvider::instance()->createMemoryAllocatorDumpForCurrentGC(threadDumpName);
     threadDump->addScalar("live_count", "objects", totalLiveCount);
     threadDump->addScalar("dead_count", "objects", totalDeadCount);
     threadDump->addScalar("live_size", "bytes", totalLiveSize);
     threadDump->addScalar("dead_size", "bytes", totalDeadSize);
 
     WebMemoryAllocatorDump* heapsDump = BlinkGCMemoryDumpProvider::instance()->createMemoryAllocatorDumpForCurrentGC(heapsDumpName);
     WebMemoryAllocatorDump* classesDump = BlinkGCMemoryDumpProvider::instance()->createMemoryAllocatorDumpForCurrentGC(classesDumpName);
     BlinkGCMemoryDumpProvider::instance()->currentProcessMemoryDump()->addOwnershipEdge(classesDump->guid(), heapsDump->guid());
 }
 
 } // namespace blink