Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2150)

Unified Diff: webkit/common/gpu/context_provider_in_process.cc

Issue 780653007: Added GL_CHROMIUM_trace_marker feature as well as gpu_toplevel markers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated CHROMIUM_trace_marker.txt date and brace error Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/common/gpu/context_provider_in_process.cc
diff --git a/webkit/common/gpu/context_provider_in_process.cc b/webkit/common/gpu/context_provider_in_process.cc
index b02d961d70cf109cdf434197fe6dc7b86551df41..289814d757b1c2da9a6b7124b563d2130456fcaf 100644
--- a/webkit/common/gpu/context_provider_in_process.cc
+++ b/webkit/common/gpu/context_provider_in_process.cc
@@ -102,7 +102,8 @@ bool ContextProviderInProcess::BindToCurrentThread() {
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 i
vmiura 2014/12/18 02:38:52 I think this is fine.
lost_context_callback_proxy_.reset(new LostContextCallbackProxy(this));
return true;
@@ -194,6 +195,7 @@ void ContextProviderInProcess::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
vmiura 2014/12/18 02:38:52 It is not necessarily needed, as the End is implie
Ken Russell (switch to Gerrit) 2014/12/18 19:03:56 Wait a second. Looking more closely, this method i
vmiura 2014/12/18 19:30:27 Can we just remove this call David, as GL_CHROMIUM
David Yen 2014/12/18 21:25:59 Done.
base::AutoLock lock(destroyed_lock_);
return destroyed_;

Powered by Google App Engine
This is Rietveld 408576698