Add category support to JSON and SkDebugf tracing

Bug: skia:
Change-Id: I4d0bdb9d954e49b79ace0552d7b74b36a512c00d
Reviewed-on: https://skia-review.googlesource.com/25642
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Brian Osman <brianosman@google.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/tools/trace/SkDebugfTracer.h b/tools/trace/SkDebugfTracer.h
index 4350d1ac3c..ca049d707b 100644
--- a/tools/trace/SkDebugfTracer.h
+++ b/tools/trace/SkDebugfTracer.h
@@ -9,6 +9,7 @@
 #define SkDebugfTracer_DEFINED
 
 #include "SkEventTracer.h"
+#include "SkEventTracingPriv.h"
 #include "SkString.h"
 
 /**
@@ -32,16 +33,18 @@ public:
                                   const char* name,
                                   SkEventTracer::Handle handle) override;
 
-    const uint8_t* getCategoryGroupEnabled(const char* name) override;
+    const uint8_t* getCategoryGroupEnabled(const char* name) override {
+        return fCategories.getCategoryGroupEnabled(name);
+    }
 
     const char* getCategoryGroupName(const uint8_t* categoryEnabledFlag) override {
-        static const char* category = "category?";
-        return category;
+        return fCategories.getCategoryGroupName(categoryEnabledFlag);
     }
 
 private:
     SkString fIndent;
     int fCnt = 0;
+    SkEventTracingCategories fCategories;
 };
 
 #endif