Added GL_CHROMIUM_trace_marker feature as well as gpu_toplevel markers.

webkit/common/gpu/context_provider_in_process.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 "webkit/common/gpu/context_provider_in_process.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 48 matching lines @@
 
   return Create(
       WebGraphicsContext3DInProcessCommandBufferImpl::CreateOffscreenContext(
           attributes, lose_context_when_out_of_memory),
       "Offscreen");
 }
 
 ContextProviderInProcess::ContextProviderInProcess(
     scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> 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()),
       destroyed_(false),
       debug_name_(debug_name) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
   DCHECK(context3d_);
   context_thread_checker_.DetachFromThread();
 }
 
 ContextProviderInProcess::~ContextProviderInProcess() {
   DCHECK(main_thread_checker_.CalledOnValidThread() ||
          context_thread_checker_.CalledOnValidThread());
@@ skipping 13 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:11]

Same with these.

+    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));
   return true;
 }
 
 void ContextProviderInProcess::InitializeCapabilities() {
   capabilities_.gpu = context3d_->GetImplementation()->capabilities();
 
   size_t mapped_memory_limit = context3d_->GetMappedMemoryLimit();
   capabilities_.max_transfer_buffer_usage_bytes =
@@ skipping 71 matching lines @@
     destroyed_ = true;
   }
   if (!lost_context_callback_.is_null())
     base::ResetAndReturn(&lost_context_callback_).Run();
   if (gr_context_)
     gr_context_->OnLostContext();
 }
 
 bool ContextProviderInProcess::DestroyedOnMainThread() {
   DCHECK(main_thread_checker_.CalledOnValidThread());
+  if (*gpu_trace_top_level_category_) {
+    TRACE_GPU_EVENT_END0(context3d_);
+  }
 
   base::AutoLock lock(destroyed_lock_);
   return destroyed_;
 }
 
 void ContextProviderInProcess::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 ContextProviderInProcess::SetMemoryPolicyChangedCallback(
     const MemoryPolicyChangedCallback& memory_policy_changed_callback) {
   // There's no memory manager for the in-process implementation.
 }
 
 }  // namespace gpu
 }  // namespace webkit