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

src/gpu/GrTracing.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrTracing_DEFINED
 #define GrTracing_DEFINED
 
@@ skipping 69 matching lines @@
                                     target, ##__VA_ARGS__)                        \
     sk_atomic_inc(&SK_MACRO_APPEND_LINE(name_counter));                           
 
 #define INTERNAL_GR_CREATE_TRACE_MARKER(name, name_counter, target, ...)          \
     GR_CREATE_GPU_TRACE_MARKER(name, name_counter, target)                        \
     INTERNAL_TRACE_EVENT_ADD_SCOPED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"),name,   \
                        "id", name_counter, ##__VA_ARGS__);                        
 
 #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);                \
     }                                                                             
 
 
 
 #define GR_CREATE_TRACE_MARKER_CONTEXT(name, context)                             \
     INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED_C(name, context)                       
 
 #define GR_CREATE_TRACE_MARKER_CONTEXT1(name, context, arg1_name, arg1_val)       \
     INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED_C(name, context, arg1_name, arg1_val)  
 
 #define INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED_C(name, context, ...)              \
     static const char* SK_MACRO_APPEND_LINE(static_name) = name;                  \
     static int SK_MACRO_APPEND_LINE(name_counter) = 0;                            \
     INTERNAL_GR_CREATE_TRACE_MARKER_C(SK_MACRO_APPEND_LINE(static_name),          \
                                       SK_MACRO_APPEND_LINE(name_counter),         \
                                       context, ##__VA_ARGS__)                     \
     sk_atomic_inc(&SK_MACRO_APPEND_LINE(name_counter));                           
 
 #define INTERNAL_GR_CREATE_TRACE_MARKER_C(name, name_counter, context, ...)       \
     GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context)                     \
     INTERNAL_TRACE_EVENT_ADD_SCOPED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"),name,   \
                                     "id", name_counter, ##__VA_ARGS__);                        
 
 #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);                \
     }                                                                             
 
 #endif