From 65e4c614f0edbcf8d05bfc2a25a6e60d277fb7df Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Fri, 21 Jul 2017 11:06:24 -0400 Subject: 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 Commit-Queue: Brian Osman --- tools/trace/SkDebugfTracer.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tools/trace/SkDebugfTracer.h') 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 -- cgit v1.2.3