| Index: gpu/command_buffer/client/gles2_implementation.cc
|
| diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
|
| index aefc52ac8daf96a60dc4d10a884e73a814f3294a..cbbe0f49544afd6eacf12b52d410382726757db9 100644
|
| --- a/gpu/command_buffer/client/gles2_implementation.cc
|
| +++ b/gpu/command_buffer/client/gles2_implementation.cc
|
| @@ -434,9 +434,6 @@
|
| bool GLES2Implementation::OnMemoryDump(
|
| const base::trace_event::MemoryDumpArgs& args,
|
| base::trace_event::ProcessMemoryDump* pmd) {
|
| - using base::trace_event::MemoryAllocatorDump;
|
| - using base::trace_event::MemoryDumpLevelOfDetail;
|
| -
|
| if (!transfer_buffer_->HaveBuffer())
|
| return true;
|
|
|
| @@ -444,21 +441,20 @@
|
| base::trace_event::MemoryDumpManager::GetInstance()
|
| ->GetTracingProcessId();
|
|
|
| - MemoryAllocatorDump* dump = pmd->CreateAllocatorDump(base::StringPrintf(
|
| - "gpu/transfer_buffer_memory/buffer_%d", transfer_buffer_->GetShmId()));
|
| - dump->AddScalar(MemoryAllocatorDump::kNameSize,
|
| - MemoryAllocatorDump::kUnitsBytes,
|
| + base::trace_event::MemoryAllocatorDump* dump = pmd->CreateAllocatorDump(
|
| + base::StringPrintf("gpu/transfer_buffer_memory/buffer_%d",
|
| + transfer_buffer_->GetShmId()));
|
| + dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
|
| + base::trace_event::MemoryAllocatorDump::kUnitsBytes,
|
| transfer_buffer_->GetSize());
|
| -
|
| - if (args.level_of_detail != MemoryDumpLevelOfDetail::BACKGROUND) {
|
| - dump->AddScalar("free_size", MemoryAllocatorDump::kUnitsBytes,
|
| - transfer_buffer_->GetFreeSize());
|
| - auto guid = GetBufferGUIDForTracing(tracing_process_id,
|
| - transfer_buffer_->GetShmId());
|
| - const int kImportance = 2;
|
| - pmd->CreateSharedGlobalAllocatorDump(guid);
|
| - pmd->AddOwnershipEdge(dump->guid(), guid, kImportance);
|
| - }
|
| + dump->AddScalar("free_size",
|
| + base::trace_event::MemoryAllocatorDump::kUnitsBytes,
|
| + transfer_buffer_->GetFreeSize());
|
| + auto guid =
|
| + GetBufferGUIDForTracing(tracing_process_id, transfer_buffer_->GetShmId());
|
| + const int kImportance = 2;
|
| + pmd->CreateSharedGlobalAllocatorDump(guid);
|
| + pmd->AddOwnershipEdge(dump->guid(), guid, kImportance);
|
|
|
| return true;
|
| }
|
|
|