| Index: third_party/WebKit/Source/platform/web_process_memory_dump_impl.cc
|
| diff --git a/third_party/WebKit/Source/platform/web_process_memory_dump_impl.cc b/third_party/WebKit/Source/platform/web_process_memory_dump_impl.cc
|
| index 2e1745b0f5f706dd3a72f66b62add62f6355a152..cc4c5559a1d4b5dead4b7c8db2d272e4db0a72de 100644
|
| --- a/third_party/WebKit/Source/platform/web_process_memory_dump_impl.cc
|
| +++ b/third_party/WebKit/Source/platform/web_process_memory_dump_impl.cc
|
| @@ -167,21 +167,21 @@ WebProcessMemoryDumpImpl::createDiscardableMemoryAllocatorDump(
|
| }
|
|
|
| void WebProcessMemoryDumpImpl::dumpHeapUsage(
|
| - const base::hash_map<base::trace_event::AllocationContext, size_t>&
|
| - bytes_by_context,
|
| + const base::hash_map<base::trace_event::AllocationContext,
|
| + base::trace_event::AllocationsSizeAndCount>& metrics_by_context,
|
| base::trace_event::TraceEventMemoryOverhead& overhead,
|
| const char* allocator_name) {
|
| - if (!bytes_by_context.empty()) {
|
| + if (!metrics_by_context.empty()) {
|
| scoped_refptr<base::trace_event::MemoryDumpSessionState> session_state =
|
| process_memory_dump_->session_state();
|
| scoped_ptr<base::trace_event::TracedValue> heap_dump = ExportHeapDump(
|
| - bytes_by_context, session_state->stack_frame_deduplicator(),
|
| + metrics_by_context, session_state->stack_frame_deduplicator(),
|
| session_state->type_name_deduplicator());
|
| process_memory_dump_->AddHeapDump(allocator_name, std::move(heap_dump));
|
| }
|
|
|
| std::string base_name = base::StringPrintf("tracing/heap_profiler_%s",
|
| - allocator_name);
|
| + allocator_name);
|
| overhead.DumpInto(base_name.c_str(), process_memory_dump_);
|
| }
|
|
|
|
|