aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrTracing.h
diff options
context:
space:
mode:
authorGravatar Brian Osman <brianosman@google.com>2017-07-26 09:36:09 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-07-26 14:22:19 +0000
commit39c08ac3be30f9956cea7c5e4fd9a1d86e993a65 (patch)
tree0a51e1be04f6f4bbbc30e2082019316a43d4fbbf /src/gpu/GrTracing.h
parent9ac801c12c48b67b48e5a8ef2876a093b7de73fc (diff)
Automatically prepend "disabled-by-default-" to TRACE categories
Ensures that all Skia events are disabled by default in Chrome, and eliminates redundant typing. Bug: skia: Change-Id: I289c5e5a01084fcf4cccf512da65a4727f4aeca2 Reviewed-on: https://skia-review.googlesource.com/26880 Commit-Queue: Mike Klein <mtklein@chromium.org> Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'src/gpu/GrTracing.h')
-rw-r--r--src/gpu/GrTracing.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gpu/GrTracing.h b/src/gpu/GrTracing.h
index ff7d6e3494..6a6916ab89 100644
--- a/src/gpu/GrTracing.h
+++ b/src/gpu/GrTracing.h
@@ -64,13 +64,12 @@ private:
/* Chromium tracing */ \
static int SK_MACRO_APPEND_LINE(name_counter) = 0; \
bool SK_MACRO_APPEND_LINE(gpuTracingEnabled); \
- TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), \
+ TRACE_EVENT_CATEGORY_GROUP_ENABLED("skia.gpu", \
&SK_MACRO_APPEND_LINE(gpuTracingEnabled)); \
if (SK_MACRO_APPEND_LINE(gpuTracingEnabled)) { \
INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED(name, SK_MACRO_APPEND_LINE(name_counter), target) \
} \
- INTERNAL_TRACE_EVENT_ADD_SCOPED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), name, \
- "id", SK_MACRO_APPEND_LINE(name_counter));
+ INTERNAL_TRACE_EVENT_ADD_SCOPED("skia.gpu", name, "id", SK_MACRO_APPEND_LINE(name_counter));
#define INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED(name, name_counter, target) \
static const char* SK_MACRO_APPEND_LINE(static_name) = name; \
@@ -94,14 +93,14 @@ private:
/* Chromium tracing */ \
static int SK_MACRO_APPEND_LINE(name_counter) = 0; \
bool SK_MACRO_APPEND_LINE(gpuTracingEnabled); \
- TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), \
+ TRACE_EVENT_CATEGORY_GROUP_ENABLED("skia.gpu", \
&SK_MACRO_APPEND_LINE(gpuTracingEnabled)); \
if (SK_MACRO_APPEND_LINE(gpuTracingEnabled)) { \
INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED_C(classname "::" op, \
SK_MACRO_APPEND_LINE(name_counter), context) \
} \
GR_AUDIT_TRAIL_AUTO_FRAME(context->getAuditTrail(), classname "::" op); \
- INTERNAL_TRACE_EVENT_ADD_SCOPED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), classname "::" op, \
+ INTERNAL_TRACE_EVENT_ADD_SCOPED("skia.gpu", classname "::" op, \
"id", SK_MACRO_APPEND_LINE(name_counter));
#define INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED_C(name, name_counter, context) \