Enable gpu Debug markers if tracing category skia.gpu is enabled

src/gpu/GrTracing.h

Index: src/gpu/GrTracing.h
diff --git a/src/gpu/GrTracing.h b/src/gpu/GrTracing.h
index efe0fce4a156808ffa741cf30ce22ec3574ef0bf..1770e4f99f750924708c2d2e88bfd8011bc52e8a 100644
--- a/src/gpu/GrTracing.h
+++ b/src/gpu/GrTracing.h
@@ -87,7 +87,10 @@ private:
 
 #define GR_CREATE_GPU_TRACE_MARKER(name, name_counter, target)                    \
     GrGpuTraceMarkerGenerator SK_MACRO_APPEND_LINE(TMG)(target);                  \
-    if (target->isGpuTracingEnabled()) {                                          \
+    bool gpuTracingEnabled;                                                       \

[bsalomon, 2014/08/04 19:07:33]

If we're adding var names we should either append a line number or scope this in
{} to avoid collisions.

+    TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"),     \
+                                        &gpuTracingEnabled);                      \
+    if (gpuTracingEnabled) {                                                      \
         SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter);                \
     }                                                                             
 
@@ -114,7 +117,10 @@ private:
 
 #define GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context)                 \
     GrGpuTraceMarkerGeneratorContext SK_MACRO_APPEND_LINE(TMG)(context);          \
-    if (context->isGpuTracingEnabled()) {                                         \
+    bool gpuTracingEnabled;                                                       \
+    TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"),     \
+                                        &gpuTracingEnabled);                      \
+    if (gpuTracingEnabled) {                                                      \
         SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter);                \
     }