Use forwarding with SkTLazy::init.

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
 
 #include "GrBufferedDrawTarget.h"
 #include "GrDrawTarget.h"
 #include "GrGpu.h"
 #include "GrTraceMarker.h"
+#include "SkTLazy.h"
 #include "SkTraceEvent.h"
 
 /**
  * Marker generation class used for adding and removing markers around code blocks
  */
 class GrGpuTraceMarkerGenerator : public ::SkNoncopyable {
 public:
     GrGpuTraceMarkerGenerator(GrDrawTarget* target) : fTarget(target) {}
 
     ~GrGpuTraceMarkerGenerator() {
         if (fTraceMarker.isValid()) {
             fTarget->removeGpuTraceMarker(fTraceMarker.get());
         }
     }
 
     void initialize(const char* marker_str, int* marker_counter) {
-        GrGpuTraceMarker* traceMarker = fTraceMarker.init();
-        traceMarker->fMarker = marker_str;
-        traceMarker->fID = *marker_counter;
+        GrGpuTraceMarker* traceMarker = fTraceMarker.init(marker_str, *marker_counter);
         fTarget->addGpuTraceMarker(traceMarker);
     }
 
 private:
     GrDrawTarget* fTarget;
     SkTLazy<GrGpuTraceMarker> fTraceMarker;
 };
 
 class GrGpuTraceMarkerGeneratorContext : public ::SkNoncopyable {
 public:
     GrGpuTraceMarkerGeneratorContext(GrContext* context) : fContext(context) {}
 
     ~GrGpuTraceMarkerGeneratorContext() {
         if (fTraceMarker.isValid()) {
             fContext->removeGpuTraceMarker(fTraceMarker.get());
         }
     }
 
     void initialize(const char* marker_str, int* marker_counter) {
-        GrGpuTraceMarker* traceMarker = fTraceMarker.init();
-        traceMarker->fMarker = marker_str;
-        traceMarker->fID = *marker_counter;
+        GrGpuTraceMarker* traceMarker = fTraceMarker.init(marker_str, *marker_counter);
         fContext->addGpuTraceMarker(traceMarker);
     }
 
 private:
     GrContext* fContext;
     SkTLazy<GrGpuTraceMarker> fTraceMarker;
 };
 
 /**
  * GR_CREATE_TRACE_MARKER will place begin and end trace markers for both
@@ skipping 62 matching lines @@
     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
 
 #endif