commit 59bcfaed660369da2a08fc3ad1ec2799b646f3e1
author mtklein <mtklein@chromium.org> Tue Apr 21 09:38:03 2015 -0700
committer Commit bot <commit-bot@chromium.org> Tue Apr 21 09:38:03 2015 -0700
tree 3d17415c159a4fb9088f18cb7555d7e614e034d4
parent ae32c102e70577bff1432ef4b4b63ca6835012f6

Split default and user-supplied event tracers.

Chrome's got a test scenario where setting the user-supplied tracer is racing with a concurrent use of the default tracer.

BUG=chromium:437044

No public API changes.
TBR=reed@google.com

Review URL: https://codereview.chromium.org/1099123002

include/utils/SkEventTracer.h

diff --git a/include/utils/SkEventTracer.h b/include/utils/SkEventTracer.h
index 8d9fd11..f4f8676 100644
--- a/include/utils/SkEventTracer.h
+++ b/include/utils/SkEventTracer.h
@@ -29,10 +29,7 @@
 
     static SkEventTracer* GetInstance();
 
-    static void SetInstance(SkEventTracer* tracer) {
-        SkDELETE(SkEventTracer::gInstance);
-        SkEventTracer::gInstance = tracer;
-    }
+    static void SetInstance(SkEventTracer*);
 
     virtual ~SkEventTracer() { }
 
@@ -68,8 +65,6 @@
         updateTraceEventDuration(const uint8_t* categoryEnabledFlag,
                                  const char* name,
                                  SkEventTracer::Handle handle) = 0;
-private:
-    static SkEventTracer *gInstance;
 };
 
 #endif // SkEventTracer_DEFINED