Strip font name of special characters before dumping

The font name can contain special characters in some OS that is
considered as delimiters ('/') by the traces. This causes error in the
dump name. This CL strips the fone name obtained before adding it to
traces.

This also adds discardable memory size for resources in cache.

BUG=532838

Review URL: https://codereview.chromium.org/1346993006

1 files changed, 12 insertions, 3 deletions

diff --git a/src/core/SkGlyphCache.cpp b/src/core/SkGlyphCache.cpp
index 3f64d6ed48..ed158d3600 100644
--- a/src/core/SkGlyphCache.cpp
+++ b/src/core/SkGlyphCache.cpp
@@ -14,6 +14,8 @@
 #include "SkTraceMemoryDump.h"
 #include "SkTypeface.h"
 
+#include <cctype>
+
 //#define SPEW_PURGE_STATUS
 
 namespace {
@@ -427,12 +429,19 @@ static void sk_trace_dump_visitor(const SkGlyphCache& cache, void* context) {
     *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) {
+        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());