Added GL_CHROMIUM_trace_marker feature as well as gpu_toplevel markers.

content/browser/renderer_host/render_widget_host_view_android.cc

 // Copyright (c) 2012 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/browser/renderer_host/render_widget_host_view_android.h"
 
 #include <android/bitmap.h>
 
 #include "base/android/build_info.h"
 #include "base/basictypes.h"
@@ skipping 100 matching lines @@
   // WebGraphicsContextLostCallback implementation.
   virtual void onContextLost() override;
 
   GLHelper* GetGLHelper() { return gl_helper_.get(); }
   bool IsLost() { return !context_.get() || context_->isContextLost(); }
 
  private:
   GLHelperHolder();
   static scoped_ptr<WebGraphicsContext3DCommandBufferImpl> CreateContext3D();
 
+  // Whether gpu_toplevel category is enabled.
+  const unsigned char* gpu_trace_top_level_category_;
+
   scoped_ptr<GLHelper> gl_helper_;
   scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context_;
 
   DISALLOW_COPY_AND_ASSIGN(GLHelperHolder);
 };
 
 GLHelperHolder* GLHelperHolder::Create() {
   GLHelperHolder* holder = new GLHelperHolder;
   holder->Initialize();
 
   return holder;
 }
 
-GLHelperHolder::GLHelperHolder() {
+GLHelperHolder::GLHelperHolder()
+    : gpu_trace_top_level_category_(TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(
+          TRACE_DISABLED_BY_DEFAULT("gpu_toplevel"))) {
 }
 
 GLHelperHolder::~GLHelperHolder() {
+  if (context_ && *gpu_trace_top_level_category_) {

[vmiura, 2014/12/09 00:18:10]

Check if the category is enabled inside the macros instead of here.  You'll need
to pass the category to END0 as well.

+    TRACE_GPU_EVENT_END0(context_);
+  }
 }
 
 void GLHelperHolder::Initialize() {
   context_ = CreateContext3D();
   if (context_) {
     context_->setContextLostCallback(this);
     gl_helper_.reset(new GLHelper(context_->GetImplementation(),
                                   context_->GetContextSupport()));
   }
 }
@@ skipping 36 matching lines @@
       3 * full_screen_texture_size_in_bytes, kDefaultMaxTransferBufferSize);
   limits.mapped_memory_reclaim_limit =
       WebGraphicsContext3DCommandBufferImpl::kNoLimit;
   bool lose_context_when_out_of_memory = false;
   scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context(
       new WebGraphicsContext3DCommandBufferImpl(
           0,  // offscreen
           url, gpu_channel_host.get(), attrs, lose_context_when_out_of_memory,
           limits, nullptr));
   if (context->InitializeOnCurrentThread()) {
-    context->pushGroupMarkerEXT(
-        base::StringPrintf("CmdBufferImageTransportFactory-%p",
-                           context.get()).c_str());
+    if (*gpu_trace_top_level_category_) {

[vmiura, 2014/12/09 00:18:10]

Same, check if the category is enabled inside the macros instead of here.

+      TRACE_GPU_EVENT_BEGIN0(
+          context,
+          TRACE_DISABLED_BY_DEFAULT("gpu_toplevel"),
+          base::StringPrintf("CmdBufferImageTransportFactory-%p",
+                             context.get()).c_str());
+    }
   } else {
     context.reset();
   }
 
   return context.Pass();
 }
 
 // This can only be used for readback postprocessing. It may return null if the
 // channel was lost and not reestablished yet.
 GLHelper* GetPostReadbackGLHelper() {
@@ skipping 1684 matching lines @@
   results->orientationAngle = display.RotationAsDegree();
   results->orientationType =
       RenderWidgetHostViewBase::GetOrientationTypeForMobile(display);
   gfx::DeviceDisplayInfo info;
   results->depth = info.GetBitsPerPixel();
   results->depthPerComponent = info.GetBitsPerComponent();
   results->isMonochrome = (results->depthPerComponent == 0);
 }
 
 } // namespace content