Added GL_CHROMIUM_trace_marker feature as well as gpu_toplevel markers.

content/common/gpu/client/context_provider_command_buffer.cc

 // Copyright (c) 2013 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/common/gpu/client/context_provider_command_buffer.h"
 
 #include <set>
 #include <vector>
 
 #include "base/callback_helpers.h"
@@ skipping 30 matching lines @@
     const std::string& debug_name) {
   if (!context3d)
     return NULL;
 
   return new ContextProviderCommandBuffer(context3d.Pass(), debug_name);
 }
 
 ContextProviderCommandBuffer::ContextProviderCommandBuffer(
     scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context3d,
     const std::string& debug_name)
-    : context3d_(context3d.Pass()),
+    : gpu_trace_top_level_category_(TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(
+          TRACE_DISABLED_BY_DEFAULT("gpu_toplevel"))),
+      context3d_(context3d.Pass()),
       debug_name_(debug_name),
       destroyed_(false) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
   DCHECK(context3d_);
   context_thread_checker_.DetachFromThread();
 }
 
 ContextProviderCommandBuffer::~ContextProviderCommandBuffer() {
   DCHECK(main_thread_checker_.CalledOnValidThread() ||
          context_thread_checker_.CalledOnValidThread());
@@ skipping 27 matching lines @@
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
   if (lost_context_callback_proxy_)
     return true;
 
   if (!context3d_->InitializeOnCurrentThread())
     return false;
 
   InitializeCapabilities();
 
-  std::string unique_context_name =
-      base::StringPrintf("%s-%p", debug_name_.c_str(), context3d_.get());
-  context3d_->pushGroupMarkerEXT(unique_context_name.c_str());
+  if (*gpu_trace_top_level_category_) {

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

As in render_widget_host_view_android.cc, move the category checks into the
macros.

+    std::string unique_context_name =
+        base::StringPrintf("%s-%p", debug_name_.c_str(), context3d_.get());
+    TRACE_GPU_EVENT_BEGIN0(context3d_,
+                           TRACE_DISABLED_BY_DEFAULT("gpu_toplevel"),
+                           unique_context_name.c_str());
+  }
 
   lost_context_callback_proxy_.reset(new LostContextCallbackProxy(this));
   context3d_->GetCommandBufferProxy()->SetMemoryAllocationChangedCallback(
       base::Bind(&ContextProviderCommandBuffer::OnMemoryAllocationChanged,
                  base::Unretained(this)));
   return true;
 }
 
 gpu::gles2::GLES2Interface* ContextProviderCommandBuffer::ContextGL() {
   DCHECK(context3d_);
@@ skipping 80 matching lines @@
   size_t mapped_memory_limit = context3d_->GetMappedMemoryLimit();
   caps.max_transfer_buffer_usage_bytes =
       mapped_memory_limit == WebGraphicsContext3DCommandBufferImpl::kNoLimit
       ? std::numeric_limits<size_t>::max() : mapped_memory_limit;
 
   capabilities_ = caps;
 }
 
 bool ContextProviderCommandBuffer::DestroyedOnMainThread() {
   DCHECK(main_thread_checker_.CalledOnValidThread());
+  if (*gpu_trace_top_level_category_) {
+    TRACE_GPU_EVENT_END0(context3d_);
+  }
 
   base::AutoLock lock(main_thread_lock_);
   return destroyed_;
 }
 
 void ContextProviderCommandBuffer::SetLostContextCallback(
     const LostContextCallback& lost_context_callback) {
   DCHECK(context_thread_checker_.CalledOnValidThread());
   DCHECK(lost_context_callback_.is_null() ||
          lost_context_callback.is_null());
   lost_context_callback_ = lost_context_callback;
 }
 
 void ContextProviderCommandBuffer::SetMemoryPolicyChangedCallback(
     const MemoryPolicyChangedCallback& memory_policy_changed_callback) {
   DCHECK(context_thread_checker_.CalledOnValidThread());
   DCHECK(memory_policy_changed_callback_.is_null() ||
          memory_policy_changed_callback.is_null());
   memory_policy_changed_callback_ = memory_policy_changed_callback;
 }
 
 }  // namespace content