| Index: skia/ext/skia_memory_dump_provider.cc
|
| diff --git a/skia/ext/skia_memory_dump_provider.cc b/skia/ext/skia_memory_dump_provider.cc
|
| index 3944ad40fa3d48b0589678166b49796d6e93e572..3682679cd6b77dc18f19d1c81e2d6b48e6747794 100644
|
| --- a/skia/ext/skia_memory_dump_provider.cc
|
| +++ b/skia/ext/skia_memory_dump_provider.cc
|
| @@ -7,6 +7,7 @@
|
| #include "base/trace_event/memory_allocator_dump.h"
|
| #include "base/trace_event/memory_dump_manager.h"
|
| #include "base/trace_event/process_memory_dump.h"
|
| +#include "skia/ext/SkTraceMemoryDump_chrome.h"
|
| #include "third_party/skia/include/core/SkGraphics.h"
|
| #include "third_party/skia/src/core/SkResourceCache.h"
|
|
|
| @@ -27,15 +28,25 @@ bool SkiaMemoryDumpProvider::OnMemoryDump(
|
| base::trace_event::ProcessMemoryDump* process_memory_dump) {
|
| auto font_mad =
|
| process_memory_dump->CreateAllocatorDump("skia/sk_font_cache");
|
| - font_mad->AddScalar("size", "bytes", SkGraphics::GetFontCacheUsed());
|
| - font_mad->AddScalar("count", "objects", SkGraphics::GetFontCacheCountUsed());
|
| + font_mad->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
|
| + base::trace_event::MemoryAllocatorDump::kUnitsBytes,
|
| + SkGraphics::GetFontCacheUsed());
|
| + font_mad->AddScalar(base::trace_event::MemoryAllocatorDump::kNameObjectsCount,
|
| + base::trace_event::MemoryAllocatorDump::kUnitsObjects,
|
| + SkGraphics::GetFontCacheCountUsed());
|
|
|
| auto resource_mad =
|
| process_memory_dump->CreateAllocatorDump("skia/sk_resource_cache");
|
| - resource_mad->AddScalar("size", "bytes",
|
| + resource_mad->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
|
| + base::trace_event::MemoryAllocatorDump::kUnitsBytes,
|
| SkResourceCache::GetTotalBytesUsed());
|
| - // TODO(ssid): crbug.com/503168. Add sub-allocation edges from discardable or
|
| - // malloc memory dumps to avoid double counting.
|
| +
|
| + if (args.level_of_detail ==
|
| + base::trace_event::MemoryDumpArgs::LevelOfDetail::LOW)
|
| + return true;
|
| +
|
| + SkTraceMemoryDump_Chrome skia_dumper(process_memory_dump);
|
| + SkResourceCache::DumpMemoryStatistics(&skia_dumper);
|
|
|
| return true;
|
| }
|
|
|