Index: gpu/command_buffer/service/buffer_manager.cc |
diff --git a/gpu/command_buffer/service/buffer_manager.cc b/gpu/command_buffer/service/buffer_manager.cc |
index 68a85bccf4e5bb822f67319e994e57fbd299180b..e1a2171e1bd122f16e261b7a66fe072f1464f9b1 100644 |
--- a/gpu/command_buffer/service/buffer_manager.cc |
+++ b/gpu/command_buffer/service/buffer_manager.cc |
@@ -734,21 +734,6 @@ |
bool BufferManager::OnMemoryDump(const base::trace_event::MemoryDumpArgs& args, |
base::trace_event::ProcessMemoryDump* pmd) { |
- using base::trace_event::MemoryAllocatorDump; |
- using base::trace_event::MemoryDumpLevelOfDetail; |
- |
- if (args.level_of_detail == MemoryDumpLevelOfDetail::BACKGROUND) { |
- std::string dump_name = |
- base::StringPrintf("gpu/gl/buffers/share_group_%" PRIu64 "", |
- memory_tracker_->ShareGroupTracingGUID()); |
- MemoryAllocatorDump* dump = pmd->CreateAllocatorDump(dump_name); |
- dump->AddScalar(MemoryAllocatorDump::kNameSize, |
- MemoryAllocatorDump::kUnitsBytes, mem_represented()); |
- |
- // Early out, no need for more detail in a BACKGROUND dump. |
- return true; |
- } |
- |
const uint64_t share_group_tracing_guid = |
memory_tracker_->ShareGroupTracingGUID(); |
for (const auto& buffer_entry : buffers_) { |
@@ -758,9 +743,10 @@ |
std::string dump_name = |
base::StringPrintf("gpu/gl/buffers/share_group_%" PRIu64 "/buffer_%d", |
share_group_tracing_guid, client_buffer_id); |
- MemoryAllocatorDump* dump = pmd->CreateAllocatorDump(dump_name); |
- dump->AddScalar(MemoryAllocatorDump::kNameSize, |
- MemoryAllocatorDump::kUnitsBytes, |
+ base::trace_event::MemoryAllocatorDump* dump = |
+ pmd->CreateAllocatorDump(dump_name); |
+ dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize, |
+ base::trace_event::MemoryAllocatorDump::kUnitsBytes, |
static_cast<uint64_t>(buffer->size())); |
auto guid = gl::GetGLBufferGUIDForTracing(share_group_tracing_guid, |
@@ -768,7 +754,6 @@ |
pmd->CreateSharedGlobalAllocatorDump(guid); |
pmd->AddOwnershipEdge(dump->guid(), guid); |
} |
- |
return true; |
} |