Add Gpu Tracing to Ganesh

src/gpu/gl/GrGpuGL.cpp

Index: src/gpu/gl/GrGpuGL.cpp
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp
index 5fb268863b25a256113631ca3f06705e0024116a..f78be714cb2093aca5386169a542d031bc552f0d 100644
--- a/src/gpu/gl/GrGpuGL.cpp
+++ b/src/gpu/gl/GrGpuGL.cpp
@@ -2661,24 +2661,19 @@ bool GrGpuGL::onCanCopySurface(GrSurface* dst,
     return INHERITED::onCanCopySurface(dst, src, srcRect, dstPoint);
 }
 
-void GrGpuGL::onInstantGpuTraceEvent(const char* marker) {
+void GrGpuGL::didAddGpuTraceMarker() {
     if (this->caps()->gpuTracingSupport()) {
-        // GL_CALL(InsertEventMarker(0, marker));
+        const GrTraceMarkerSet& markerArray = this->getActiveTraceMarkers();
+        SkString markerString = markerArray.toString();
+        GL_CALL(PushGroupMarker(0, markerString.c_str()));
     }
 }
 
-void GrGpuGL::onPushGpuTraceEvent(const char* marker) {
+void GrGpuGL::didRemoveGpuTraceMarker() {
     if (this->caps()->gpuTracingSupport()) {
-        // GL_CALL(PushGroupMarker(0, marker));
+        GL_CALL(PopGroupMarker());
     }
 }
-
-void GrGpuGL::onPopGpuTraceEvent() {
-    if (this->caps()->gpuTracingSupport()) {
-        // GL_CALL(PopGroupMarker());
-    }
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 GrGLAttribArrayState* GrGpuGL::HWGeometryState::bindArrayAndBuffersToDraw(