| Index: skia/ext/SkTraceMemoryDump_chrome.cc
|
| diff --git a/skia/ext/SkTraceMemoryDump_chrome.cc b/skia/ext/SkTraceMemoryDump_chrome.cc
|
| index a5309047630f61f095fa7977f713d904cac2927b..c4bda0cd67210ca3ccbfa3424c1beff721298317 100644
|
| --- a/skia/ext/SkTraceMemoryDump_chrome.cc
|
| +++ b/skia/ext/SkTraceMemoryDump_chrome.cc
|
| @@ -16,14 +16,20 @@ const char kMallocBackingType[] = "malloc";
|
| }
|
|
|
| SkTraceMemoryDump_Chrome::SkTraceMemoryDump_Chrome(
|
| + base::trace_event::MemoryDumpLevelOfDetail level_of_detail,
|
| base::trace_event::ProcessMemoryDump* process_memory_dump)
|
| - : SkTraceMemoryDump_Chrome("", process_memory_dump) {}
|
| + : SkTraceMemoryDump_Chrome("", level_of_detail, process_memory_dump) {}
|
|
|
| SkTraceMemoryDump_Chrome::SkTraceMemoryDump_Chrome(
|
| - const char* dump_name_prefix,
|
| + const std::string& dump_name_prefix,
|
| + base::trace_event::MemoryDumpLevelOfDetail level_of_detail,
|
| base::trace_event::ProcessMemoryDump* process_memory_dump)
|
| : dump_name_prefix_(dump_name_prefix),
|
| - process_memory_dump_(process_memory_dump) {}
|
| + process_memory_dump_(process_memory_dump),
|
| + request_level_(
|
| + level_of_detail == base::trace_event::MemoryDumpLevelOfDetail::LIGHT
|
| + ? SkTraceMemoryDump::kLight_LevelOfDetail
|
| + : SkTraceMemoryDump::kObjectsBreakdowns_LevelOfDetail) {}
|
|
|
| SkTraceMemoryDump_Chrome::~SkTraceMemoryDump_Chrome() {}
|
|
|
| @@ -64,6 +70,11 @@ void SkTraceMemoryDump_Chrome::setDiscardableMemoryBacking(
|
| DCHECK(dump);
|
| }
|
|
|
| +SkTraceMemoryDump::LevelOfDetail SkTraceMemoryDump_Chrome::getRequestedDetails()
|
| + const {
|
| + return request_level_;
|
| +}
|
| +
|
| base::trace_event::MemoryAllocatorDump*
|
| SkTraceMemoryDump_Chrome::GetOrCreateAllocatorDump(const char* dumpName) {
|
| std::string name = dump_name_prefix_ + dumpName;
|
|
|