| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "platform/instrumentation/tracing/web_process_memory_dump.h" | 5 #include "platform/instrumentation/tracing/web_process_memory_dump.h" |
| 6 | 6 |
| 7 #include "base/memory/discardable_memory.h" | 7 #include "base/memory/discardable_memory.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "base/trace_event/heap_profiler_heap_dump_writer.h" | 10 #include "base/trace_event/heap_profiler_heap_dump_writer.h" |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 WebProcessMemoryDump::CreateDiscardableMemoryAllocatorDump( | 168 WebProcessMemoryDump::CreateDiscardableMemoryAllocatorDump( |
| 169 const std::string& name, | 169 const std::string& name, |
| 170 base::DiscardableMemory* discardable) { | 170 base::DiscardableMemory* discardable) { |
| 171 base::trace_event::MemoryAllocatorDump* dump = | 171 base::trace_event::MemoryAllocatorDump* dump = |
| 172 discardable->CreateMemoryAllocatorDump(name.c_str(), | 172 discardable->CreateMemoryAllocatorDump(name.c_str(), |
| 173 process_memory_dump_); | 173 process_memory_dump_); |
| 174 return CreateWebMemoryAllocatorDump(dump); | 174 return CreateWebMemoryAllocatorDump(dump); |
| 175 } | 175 } |
| 176 | 176 |
| 177 void WebProcessMemoryDump::DumpHeapUsage( | 177 void WebProcessMemoryDump::DumpHeapUsage( |
| 178 const base::hash_map<base::trace_event::AllocationContext, | 178 const std::unordered_map<base::trace_event::AllocationContext, |
| 179 base::trace_event::AllocationMetrics>& | 179 base::trace_event::AllocationMetrics>& |
| 180 metrics_by_context, | 180 metrics_by_context, |
| 181 base::trace_event::TraceEventMemoryOverhead& overhead, | 181 base::trace_event::TraceEventMemoryOverhead& overhead, |
| 182 const char* allocator_name) { | 182 const char* allocator_name) { |
| 183 process_memory_dump_->DumpHeapUsage(metrics_by_context, overhead, | 183 process_memory_dump_->DumpHeapUsage(metrics_by_context, overhead, |
| 184 allocator_name); | 184 allocator_name); |
| 185 } | 185 } |
| 186 | 186 |
| 187 } // namespace content | 187 } // namespace content |
| OLD | NEW |