Move atomicinc in GrTracing to behind branch

src/gpu/GrTracing.h

Index: src/gpu/GrTracing.h
diff --git a/src/gpu/GrTracing.h b/src/gpu/GrTracing.h
index d758c0329d9afdc070f61d04d25a20039985b40b..e3a7c67e9de00d5c4f501765ecaa93794994700b 100644
--- a/src/gpu/GrTracing.h
+++ b/src/gpu/GrTracing.h
@@ -11,9 +11,12 @@
 #include "GrDrawTarget.h"
 #include "GrGpu.h"
 #include "GrTraceMarker.h"
+#include "SkRTConf.h"
 #include "SkTLazy.h"
 #include "SkTraceEvent.h"
 
+SK_CONF_DECLARE(bool, c_GpuTracing, "gpu.tracing", false, "Enables GPU Tracing.");
+
 /**
  * Marker generation class used for adding and removing markers around code blocks
  */
@@ -61,10 +64,13 @@ private:
  * marker is of type const char* and target is of type GrDrawTarget*
  */
 #define GR_CREATE_TRACE_MARKER(name, target)                                      \
-    INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED(name, target)                          
-
-#define GR_CREATE_TRACE_MARKER1(name, target, arg1_name, arg1_val)                \
-    INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED(name, target, arg1_name, arg1_val)     
+    /* Chromium tracing */                                                        \
+    bool SK_MACRO_APPEND_LINE(gpuTracingEnabled);                                 \
+    TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"),     \
+                                       &SK_MACRO_APPEND_LINE(gpuTracingEnabled)); \
+    if (c_GpuTracing || SK_MACRO_APPEND_LINE(gpuTracingEnabled)) {                \
+        INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED(name, target)                      \
+    }
 
 #define INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED(name, target, ...)                 \
     static const char* SK_MACRO_APPEND_LINE(static_name) = name;                  \
@@ -79,26 +85,18 @@ private:
     INTERNAL_TRACE_EVENT_ADD_SCOPED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"),name,   \
                        "id", name_counter, ##__VA_ARGS__);                        
 
-#if GR_FORCE_GPU_TRACE_DEBUGGING
-#define GR_CREATE_GPU_TRACE_MARKER(name, name_counter, target)                     \
-    GrGpuTraceMarkerGenerator SK_MACRO_APPEND_LINE(TMG)(target);                   \
-    SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter);
-#else
-#define GR_CREATE_GPU_TRACE_MARKER(name, name_counter, target)                     \
-    GrGpuTraceMarkerGenerator SK_MACRO_APPEND_LINE(TMG)(target);                   \
-    bool SK_MACRO_APPEND_LINE(gpuTracingEnabled);                                  \
-    TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"),      \
-                                        &SK_MACRO_APPEND_LINE(gpuTracingEnabled)); \
-    if (SK_MACRO_APPEND_LINE(gpuTracingEnabled)) {                                 \
-        SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter);                 \
-    }                                                                             
-#endif
+#define GR_CREATE_GPU_TRACE_MARKER(name, name_counter, target)                    \
+    GrGpuTraceMarkerGenerator SK_MACRO_APPEND_LINE(TMG)(target);                  \
+    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)  
+    /* Chromium tracing */                                                        \
+    bool SK_MACRO_APPEND_LINE(gpuTracingEnabled);                                 \
+    TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"),     \
+                                       &SK_MACRO_APPEND_LINE(gpuTracingEnabled)); \
+    if (c_GpuTracing || SK_MACRO_APPEND_LINE(gpuTracingEnabled)) {                \
+        INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED_C(name, context)                   \
+    }
 
 #define INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED_C(name, context, ...)              \
     static const char* SK_MACRO_APPEND_LINE(static_name) = name;                  \
@@ -113,19 +111,8 @@ private:
     INTERNAL_TRACE_EVENT_ADD_SCOPED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"),name,   \
                                     "id", name_counter, ##__VA_ARGS__);                        
 
-#if GR_FORCE_GPU_TRACE_DEBUGGING
-#define GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context)                  \
-    GrGpuTraceMarkerGeneratorContext SK_MACRO_APPEND_LINE(TMG)(context);           \
-    SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter);
-#else
-#define GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context)                  \
-    GrGpuTraceMarkerGeneratorContext SK_MACRO_APPEND_LINE(TMG)(context);           \
-    bool SK_MACRO_APPEND_LINE(gpuTracingEnabled);                                  \
-    TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"),      \
-                                        &SK_MACRO_APPEND_LINE(gpuTracingEnabled)); \
-    if (SK_MACRO_APPEND_LINE(gpuTracingEnabled)) {                                 \
-        SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter);                 \
-    }                                                                             
-#endif
+#define GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context)                 \
+    GrGpuTraceMarkerGeneratorContext SK_MACRO_APPEND_LINE(TMG)(context);          \
+    SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter);                    \
 
 #endif