Add support for light dumps in SkTraceMemoryDump interface.

src/core/SkGlyphCache.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkGlyphCache.h"
 #include "SkGlyphCache_Globals.h"
 #include "SkGraphics.h"
@@ skipping 412 matching lines @@
 }
 
 static void sk_trace_dump_visitor(const SkGlyphCache& cache, void* context) {
     SkGlyphCacheDumpContext* dumpContext = static_cast<SkGlyphCacheDumpContext*>(context);
     SkTraceMemoryDump* dump = dumpContext->dump;
     int* counter = dumpContext->counter;
     int index = *counter;
     *counter += 1;
 
     const SkTypeface* face = cache.getScalerContext()->getTypeface();
-    SkString font_name;
-    face->getFamilyName(&font_name);
+    SkString fontName;
+    face->getFamilyName(&fontName);
     const SkScalerContextRec& rec = cache.getScalerContext()->getRec();
 
-    SkString dump_name = SkStringPrintf("%s/%s_%3d/index_%d",
-                                        gGlyphCacheDumpName, font_name.c_str(), rec.fFontID, index);
+    SkString dumpName = SkStringPrintf("%s/%s_%3d/index_%d",
+                                        gGlyphCacheDumpName, fontName.c_str(), rec.fFontID, index);
 
-    dump->dumpNumericValue(dump_name.c_str(), "size", "bytes", cache.getMemoryUsed());
-    dump->dumpNumericValue(dump_name.c_str(), "glyph_count", "objects", cache.countCachedGlyphs());
-    dump->setMemoryBacking(dump_name.c_str(), "malloc", nullptr);
+    dump->dumpNumericValue(dumpName.c_str(), "size", "bytes", cache.getMemoryUsed());
+    dump->dumpNumericValue(dumpName.c_str(), "glyph_count", "objects", cache.countCachedGlyphs());
+    dump->setMemoryBacking(dumpName.c_str(), "malloc", nullptr);
 }
 
 void SkGlyphCache::DumpMemoryStatistics(SkTraceMemoryDump* dump) {
+    if (!(dump->getRequestedDetails() | SkTraceMemoryDump::kMemoryTotals |
+              SkTraceMemoryDump::kMallocDetails))
+        return;
+
     dump->dumpNumericValue(gGlyphCacheDumpName, "size", "bytes", SkGraphics::GetFontCacheUsed());
     dump->dumpNumericValue(gGlyphCacheDumpName, "budget_size", "bytes",
                            SkGraphics::GetFontCacheLimit());
     dump->dumpNumericValue(gGlyphCacheDumpName, "glyph_count", "objects",
                            SkGraphics::GetFontCacheCountUsed());
     dump->dumpNumericValue(gGlyphCacheDumpName, "budget_glyph_count", "objects",
                            SkGraphics::GetFontCacheCountLimit());
 
+    if (!(dump->getRequestedDetails() | SkTraceMemoryDump::kMallocDetails)) {
+        dump->setMemoryBacking(gGlyphCacheDumpName, "malloc", nullptr);
+        return;
+    }
+
     int counter = 0;
     SkGlyphCacheDumpContext context = { &counter, dump };
     SkGlyphCache::VisitAll(sk_trace_dump_visitor, &context);
 }
 
 void SkGlyphCache::VisitAll(Visitor visitor, void* context) {
     SkGlyphCache_Globals& globals = get_globals();
     AutoAcquire           ac(globals.fLock);
     SkGlyphCache*         cache;
 
@@ skipping 174 matching lines @@
 }
 
 void SkGraphics::PurgeFontCache() {
     get_globals().purgeAll();
     SkTypefaceCache::PurgeAll();
 }
 
 // TODO(herb): clean up TLS apis.
 size_t SkGraphics::GetTLSFontCacheLimit() { return 0; }
 void SkGraphics::SetTLSFontCacheLimit(size_t bytes) { }