Merge Group Markers into Chromium Traces.

gpu/command_buffer/service/gles2_cmd_decoder.cc

Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index caf752e438c248a20970a11d53e92ec00eb27d44..cb79439a3bd39e357cfc7f7050129048be2a4f33 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -12914,18 +12914,21 @@ void GLES2DecoderImpl::DoInsertEventMarkerEXT(
 
 void GLES2DecoderImpl::DoPushGroupMarkerEXT(
     GLsizei length, const GLchar* marker) {
+  // While deprecating Push/Pop Group Marker, mimic HandleTraceBeginCHROMIUM().
   if (!marker) {
     marker = "";
   }
   std::string name = length ? std::string(marker, length) : std::string(marker);
+
   debug_marker_manager_.PushGroup(name);
-  gpu_tracer_->Begin(TRACE_DISABLED_BY_DEFAULT("gpu_group_marker"), name,
-                     kTraceGroupMarker);
+  gpu_tracer_->Begin("GroupMarker", name, kTraceCHROMIUM);

[vmiura, 2015/06/25 00:41:57]

Could there be a stacking problem between traces and markers?
Should this just be made no-op?

[David Yen, 2015/06/25 17:40:35]

Done.

 }
 
 void GLES2DecoderImpl::DoPopGroupMarkerEXT(void) {
-  debug_marker_manager_.PopGroup();
-  gpu_tracer_->End(kTraceGroupMarker);
+  // While deprecating Push/Pop Group Marker, just call trace CHROMIUM ones.
+  if (gpu_tracer_->End(kTraceCHROMIUM)) {
+    debug_marker_manager_.PopGroup();
+  }
 }
 
 void GLES2DecoderImpl::DoBindTexImage2DCHROMIUM(
@@ -13034,6 +13037,7 @@ error::Error GLES2DecoderImpl::HandleTraceBeginCHROMIUM(
     return error::kInvalidArguments;
   }
 
+  debug_marker_manager_.PushGroup(trace_name);
   if (!gpu_tracer_->Begin(category_name, trace_name, kTraceCHROMIUM)) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION,
@@ -13044,6 +13048,7 @@ error::Error GLES2DecoderImpl::HandleTraceBeginCHROMIUM(
 }
 
 void GLES2DecoderImpl::DoTraceEndCHROMIUM() {
+  debug_marker_manager_.PopGroup();
   if (!gpu_tracer_->End(kTraceCHROMIUM)) {
     LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION,
                        "glTraceEndCHROMIUM", "no trace begin found");