Strip font name of special characters before dumping

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"
 #include "SkOncePtr.h"
 #include "SkPath.h"
 #include "SkTemplates.h"
 #include "SkTraceMemoryDump.h"
 #include "SkTypeface.h"
 
+#include <string>
+
 //#define SPEW_PURGE_STATUS
 
 namespace {
 
 const char gGlyphCacheDumpName[] = "skia/sk_glyph_cache";
 
 // Used to pass context to the sk_trace_dump_visitor.
 struct SkGlyphCacheDumpContext {
     int* counter;
     SkTraceMemoryDump* dump;
@@ skipping 393 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();
+    const SkScalerContextRec& rec = cache.getScalerContext()->getRec();
+
     SkString fontName;
     face->getFamilyName(&fontName);
-    const SkScalerContextRec& rec = cache.getScalerContext()->getRec();
+    // Replace all special characters with '_'.
+    for (size_t index = 0; index < fontName.size(); ++index) {

[reed1, 2015/09/23 13:21:29]

What is the formal requirement for strings in your API? This above "clean-up"
looks odd to have to do it here. Can this not be done canonically for all
strings at the receiving end?

[ssid, 2015/09/23 13:30:22]

Ah yes. So the dump name is required to be seperated by a '/' to make a tree
structure. As you can see the dump name is given as : :sk_glyph_cac
he/font_name_1/index" This means that glyph cache has fonts and each type of
font has many indices.
Here '/' is a special seperator for the dump. But if the font name has this
character then it would change the tree brhavior. So to avoid that this sanitize
is added.

+        if (!std::isalnum(fontName[index])) {
+            fontName[index] = '_';
+        }
+    }
 
-    SkString dumpName = SkStringPrintf("%s/%s_%3d/index_%d",
-                                        gGlyphCacheDumpName, fontName.c_str(), rec.fFontID, index);
+    SkString dumpName = SkStringPrintf("%s/%s_%d/index_%d",
+                                       gGlyphCacheDumpName, fontName.c_str(), rec.fFontID, index);
 
     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;
@@ skipping 199 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) { }