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 <ctype.h>

[Primiano Tucci (use gerrit), 2015/09/22 17:30:35]

you don't need ctype, just <string>

[ssid, 2015/09/23 13:11:41]

Done.

+
 #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"
 
 //#define SPEW_PURGE_STATUS
@@ skipping 402 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();
+    // Dump only alpha numeric characters in font name, to avoid '/' or special chars.
+    SkString strippedName;

[Primiano Tucci (use gerrit), 2015/09/22 17:30:35]

you can make this more efficient giving a capacity hint using the original
string name, i.e.
strippedName(fontName.szie())

[ssid, 2015/09/23 13:11:40]

Done.

+    for (int index = 0; index < fontName.size(); ++index) {

[Primiano Tucci (use gerrit), 2015/09/22 17:30:35]

nit: size_t

[ssid, 2015/09/23 13:11:40]

Done.

+        if (isalnum(fontName[index])) {

[Primiano Tucci (use gerrit), 2015/09/22 17:30:35]

std::isalnum

[ssid, 2015/09/23 13:11:40]

Done.

+            strippedName += fontName[index];
+        }

[Primiano Tucci (use gerrit), 2015/09/22 17:30:35]

else: += '_'

[ssid, 2015/09/23 13:11:40]

Done.

+    }
 
-    SkString dumpName = SkStringPrintf("%s/%s_%3d/index_%d",
-                                        gGlyphCacheDumpName, fontName.c_str(), rec.fFontID, index);
+    SkString dumpName = SkStringPrintf("%s/%s_%d/index_%d",
+                                       gGlyphCacheDumpName, strippedName.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) { }