[tracing] Change outer/inner size repr. in memory dumps (blink side)

Source/platform/PartitionAllocMemoryDumpProvider.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 "config.h"
 #include "Source/platform/PartitionAllocMemoryDumpProvider.h"
 
 #include "public/platform/WebMemoryAllocatorDump.h"
 #include "public/platform/WebProcessMemoryDump.h"
 #include "wtf/Partitions.h"
@@ skipping 16 matching lines @@
     void partitionsDumpBucketStats(const char* partitionName, const PartitionBucketMemoryStats*) override;
 
 private:
     WebProcessMemoryDump* m_memoryDump;
     size_t m_uid;
 };
 
 void PartitionStatsDumperImpl::partitionsDumpBucketStats(const char* partitionName, const PartitionBucketMemoryStats* memoryStats)
 {
     ASSERT(memoryStats->isValid);
-    String format;
+    String dumpName;
     if (memoryStats->isDirectMap)
-        format = String::format("partition_alloc/%s/directMap_%zu", partitionName, ++m_uid);
+        dumpName = String::format("partition_alloc/%s/directMap_%zu", partitionName, ++m_uid);
     else
-        format = String::format("partition_alloc/%s/bucket_%zu", partitionName, static_cast<size_t>(memoryStats->bucketSlotSize));
+        dumpName = String::format("partition_alloc/%s/bucket_%zu", partitionName, static_cast<size_t>(memoryStats->bucketSlotSize));
 
-    WebMemoryAllocatorDump* allocatorDump = m_memoryDump->createMemoryAllocatorDump(format);
+    WebMemoryAllocatorDump* allocatorDump = m_memoryDump->createMemoryAllocatorDump(dumpName);
+    allocatorDump->AddScalar("size", "bytes", memoryStats->residentBytes);
+    allocatorDump->AddScalar("waste_size", "bytes", memoryStats->pageWasteSize);
     allocatorDump->AddScalar("partition_page_size", "bytes", memoryStats->allocatedPageSize);
-    allocatorDump->AddScalar("waste_size", "bytes", memoryStats->pageWasteSize);
-    allocatorDump->AddScalar("inner_size", "bytes", memoryStats->activeBytes);
-    allocatorDump->AddScalar("outer_size", "bytes", memoryStats->residentBytes);
     allocatorDump->AddScalar("freeable_size", "bytes", memoryStats->freeableBytes);
     allocatorDump->AddScalar("full_partition_pages", "objects", memoryStats->numFullPages);
     allocatorDump->AddScalar("active_partition_pages", "objects", memoryStats->numActivePages);
     allocatorDump->AddScalar("empty_partition_pages", "objects", memoryStats->numEmptyPages);
     allocatorDump->AddScalar("decommitted_partition_pages", "objects", memoryStats->numDecommittedPages);
+
+    dumpName = dumpName + "/allocated_objects";
+    WebMemoryAllocatorDump* objectsDump = m_memoryDump->createMemoryAllocatorDump(dumpName);
+    objectsDump->AddScalar("size", "bytes", memoryStats->activeBytes);
 }
 
 } // namespace
 
 PartitionAllocMemoryDumpProvider* PartitionAllocMemoryDumpProvider::instance()
 {
     DEFINE_STATIC_LOCAL(PartitionAllocMemoryDumpProvider, instance, ());
     return &instance;
 }
 
 bool PartitionAllocMemoryDumpProvider::onMemoryDump(blink::WebProcessMemoryDump* memoryDump)
 {
     PartitionStatsDumperImpl partitionStatsDumper(memoryDump);
 
     // This method calls memoryStats.partitionsDumpBucketStats with memory statistics.
     WTF::Partitions::dumpMemoryStats(&partitionStatsDumper);
     return true;
 }
 
 PartitionAllocMemoryDumpProvider::PartitionAllocMemoryDumpProvider()
 {
 }
 
 PartitionAllocMemoryDumpProvider::~PartitionAllocMemoryDumpProvider()
 {
 }
 
 } // namespace blink