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 84 matching lines @@
   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());
+  context3d_->traceBeginCHROMIUM("gpu_toplevel",
+                                 unique_context_name.c_str());

[Ken Russell (switch to Gerrit), 2014/12/17 23:56:10]

I'll have to defer to Victor's review on whether it's correct that this will be
called once per context.

[vmiura, 2014/12/18 02:38:52]

I think this is fine.

 
   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());
+  context3d_->traceEndCHROMIUM();

[Ken Russell (switch to Gerrit), 2014/12/17 23:56:10]

Similarly it's not obvious to me that calling this once at the end of the
context's lifetime is correct.

[vmiura, 2014/12/18 02:38:52]

It is not necessarily needed, as the End is implied after the last command
executed on a context.

Ken is it safe to call context3d_->* from this method?

[Ken Russell (switch to Gerrit), 2014/12/18 19:03:56]

Wait a second. Looking more closely, this method is a query, not a notification
that the context was destroyed on the main thread. I think calling
traceEndCHROMIUM is semantically incorrect here.

[vmiura, 2014/12/18 19:30:27]

Can we just remove this call David, as GL_CHROMIUM_trace_marker spec implies
that this is not needed.

[David Yen, 2014/12/18 21:25:59]

Done.

 
   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