Merge Group Markers into Chromium Traces.

content/renderer/pepper/video_decoder_shim.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/pepper/video_decoder_shim.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 
@@ skipping 294 matching lines @@
     format_ = GL_LUMINANCE;
   }
 
   if (context_provider_->ContextCapabilities().gpu.max_texture_image_units <
       4) {
     // We support YUVA textures and require 4 texture units in the fragment
     // stage.
     return false;
   }
 
-  gl_->PushGroupMarkerEXT(0, "YUVConverterContext");
-
+  gl_->TraceBeginCHROMIUM("YUVConverter", "YUVConverterContext");
   gl_->GenFramebuffers(1, &frame_buffer_);
 
   y_texture_ = CreateTexture();
   u_texture_ = CreateTexture();
   v_texture_ = CreateTexture();
   a_texture_ = CreateTexture();
 
   // Vertex positions.  Also converted to texcoords in vertex shader.
   GLfloat vertex_positions[] = {-1.f, -1.f, 1.f, -1.f, -1.f, 1.f, 1.f, 1.f};
 
   gl_->GenBuffers(1, &vertex_buffer_);
   gl_->BindBuffer(GL_ARRAY_BUFFER, vertex_buffer_);
   gl_->BufferData(GL_ARRAY_BUFFER, 2 * sizeof(GLfloat) * 4, vertex_positions,
                   GL_STATIC_DRAW);
   gl_->BindBuffer(GL_ARRAY_BUFFER, 0);
 
   program_ = CreateShader();
 
-  gl_->PopGroupMarkerEXT();
+  gl_->TraceEndCHROMIUM();
 
   context_provider_->InvalidateGrContext(kGrInvalidateState);
 
   return (program_ != 0);
 }
 
 void VideoDecoderShim::YUVConverter::Convert(
     const scoped_refptr<media::VideoFrame>& frame,
     GLuint tex_out) {
   const float* yuv_matrix = 0;
@@ skipping 61 matching lines @@
       default:
         NOTREACHED();
     }
 
     video_format_ = frame->format();
 
     // Zero these so everything is reset below.
     y_width_ = y_height_ = 0;
   }
 
-  gl_->PushGroupMarkerEXT(0, "YUVConverterContext");
+  gl_->TraceBeginCHROMIUM("YUVConverter", "YUVConverterContext");
 
   uint32_t ywidth = frame->coded_size().width();
   uint32_t yheight = frame->coded_size().height();
 
   DCHECK_EQ(frame->stride(media::VideoFrame::kUPlane),
             frame->stride(media::VideoFrame::kVPlane));
 
   uint32_t ystride = frame->stride(media::VideoFrame::kYPlane);
   uint32_t uvstride = frame->stride(media::VideoFrame::kUPlane);
 
@@ skipping 130 matching lines @@
   gl_->ActiveTexture(GL_TEXTURE2);
   gl_->BindTexture(GL_TEXTURE_2D, 0);
 
   gl_->ActiveTexture(GL_TEXTURE1);
   gl_->BindTexture(GL_TEXTURE_2D, 0);
 
   gl_->ActiveTexture(GL_TEXTURE0);
   gl_->BindTexture(GL_TEXTURE_2D, 0);
   gl_->PixelStorei(GL_UNPACK_ROW_LENGTH, 0);
 
-  gl_->PopGroupMarkerEXT();
+  gl_->TraceEndCHROMIUM();
 
   context_provider_->InvalidateGrContext(kGrInvalidateState);
 }
 
 struct VideoDecoderShim::PendingDecode {
   PendingDecode(uint32_t decode_id,
                 const scoped_refptr<media::DecoderBuffer>& buffer);
   ~PendingDecode();
 
   const uint32_t decode_id;
@@ skipping 508 matching lines @@
 void VideoDecoderShim::DeleteTexture(uint32_t texture_id) {
   gpu::gles2::GLES2Interface* gles2 = context_provider_->ContextGL();
   gles2->DeleteTextures(1, &texture_id);
 }
 
 void VideoDecoderShim::FlushCommandBuffer() {
   context_provider_->ContextGL()->Flush();
 }
 
 }  // namespace content