Index: content/child/web_process_memory_dump_impl.cc |
diff --git a/content/child/web_process_memory_dump_impl.cc b/content/child/web_process_memory_dump_impl.cc |
index 688b6c1616690ad85a52505759f6414de37044af..5fbab7195cd5e396d6b8b80e106fc809693ab102 100644 |
--- a/content/child/web_process_memory_dump_impl.cc |
+++ b/content/child/web_process_memory_dump_impl.cc |
@@ -6,19 +6,20 @@ |
#include "base/trace_event/process_memory_dump.h" |
#include "content/child/web_memory_allocator_dump_impl.h" |
+#include "skia/ext/SkTraceMemoryDump_chrome.h" |
namespace content { |
WebProcessMemoryDumpImpl::WebProcessMemoryDumpImpl() |
: owned_process_memory_dump_( |
new base::trace_event::ProcessMemoryDump(nullptr)), |
- process_memory_dump_(owned_process_memory_dump_.get()) { |
-} |
+ process_memory_dump_(owned_process_memory_dump_.get()), |
+ dump_args_(nullptr) {} |
WebProcessMemoryDumpImpl::WebProcessMemoryDumpImpl( |
+ const base::trace_event::MemoryDumpArgs* dump_args, |
base::trace_event::ProcessMemoryDump* process_memory_dump) |
- : process_memory_dump_(process_memory_dump) { |
-} |
+ : process_memory_dump_(process_memory_dump), dump_args_(dump_args) {} |
WebProcessMemoryDumpImpl::~WebProcessMemoryDumpImpl() { |
} |
@@ -132,4 +133,20 @@ void WebProcessMemoryDumpImpl::AddOwnershipEdge( |
base::trace_event::MemoryAllocatorDumpGuid(target)); |
} |
+void WebProcessMemoryDumpImpl::AddSuballocation( |
+ blink::WebMemoryAllocatorDumpGuid source, |
+ const blink::WebString& targetNodeName) { |
+ process_memory_dump_->AddSuballocation( |
+ base::trace_event::MemoryAllocatorDumpGuid(source), |
+ targetNodeName.utf8()); |
+} |
+ |
+SkTraceMemoryDump* WebProcessMemoryDumpImpl::CreateDumpAdapterForSkia( |
+ const blink::WebString& dumpNamePrefix) { |
+ sk_trace_dump_list_.push_back(new skia::SkTraceMemoryDump_Chrome( |
+ dumpNamePrefix.utf8().data(), dump_args_.level_of_detail, |
+ process_memory_dump_)); |
+ return sk_trace_dump_list_.back(); |
+} |
+ |
} // namespace content |