Add Gpu Tracing to Ganesh

src/gpu/GrInOrderDrawBuffer.h

Index: src/gpu/GrInOrderDrawBuffer.h
diff --git a/src/gpu/GrInOrderDrawBuffer.h b/src/gpu/GrInOrderDrawBuffer.h
index 60e01f01b970b802c2f819b1eb61661a7c0fd670..9f83abdd26adbd0ae52371991a75a64b4a700b2c 100644
--- a/src/gpu/GrInOrderDrawBuffer.h
+++ b/src/gpu/GrInOrderDrawBuffer.h
@@ -168,10 +168,8 @@ private:
 
     bool quickInsideClip(const SkRect& devBounds);
 
-    virtual void onInstantGpuTraceEvent(const char* marker) SK_OVERRIDE;
-    virtual void onPushGpuTraceEvent(const char* marker) SK_OVERRIDE;
-    virtual void onPopGpuTraceEvent() SK_OVERRIDE;
-
+    virtual void didAddGpuTraceMarker() SK_OVERRIDE {}
+    virtual void didRemoveGpuTraceMarker() SK_OVERRIDE {}
 
     // Attempts to concat instances from info onto the previous draw. info must represent an
     // instanced draw. The caller must have already recorded a new draw state and clip if necessary.
@@ -213,6 +211,7 @@ private:
     GrSTAllocator<kCopySurfacePreallocCnt, CopySurface>                fCopySurfaces;
     GrSTAllocator<kClipPreallocCnt, SkClipStack>                       fClips;
     GrSTAllocator<kClipPreallocCnt, SkIPoint>                          fClipOrigins;
+    SkTArray<GrTraceMarkerSet, false>                                  fGpuCmdMarkers;
 
     GrDrawTarget*                   fDstGpu;
 
@@ -245,6 +244,8 @@ private:
 
     virtual bool       isIssued(uint32_t drawID) { return drawID != fDrawID; }
 
+    void addToCmdBuffer(uint8_t cmd);
+
     bool                            fFlushing;
     uint32_t                        fDrawID;