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

Unified Diff: cc/trees/thread_proxy.cc

Issue 12252058: Add a |scope| argument to TRACE_EVENT_INSTANT* and require its presence. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix builds 2 Created 7 years, 9 months 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
« no previous file with comments | « cc/trees/layer_tree_host_impl.cc ('k') | chrome/test/base/tracing_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/thread_proxy.cc
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc
index 264c11f098a84248ce2cf74a7482083fddd9f478..f217d017a1c007eeefe6f4592a14fc0eb087a734 100644
--- a/cc/trees/thread_proxy.cc
+++ b/cc/trees/thread_proxy.cc
@@ -824,7 +824,7 @@ void ThreadProxy::ScheduledActionCommit() {
layer_tree_host_->BlocksPendingCommit()) {
// For some layer types in impl-side painting, the commit is held until
// the pending tree is activated.
- TRACE_EVENT_INSTANT0("cc", "HoldCommit");
+ TRACE_EVENT_INSTANT0("cc", "HoldCommit", TRACE_EVENT_SCOPE_THREAD);
completion_event_for_commit_held_on_tree_activation_ =
commit_completion_event_on_impl_thread_;
commit_completion_event_on_impl_thread_ = NULL;
@@ -910,7 +910,8 @@ ThreadProxy::ScheduledActionDrawAndSwapInternal(bool forced_draw) {
// Check for tree activation.
if (completion_event_for_commit_held_on_tree_activation_ &&
!layer_tree_host_impl_->pending_tree()) {
- TRACE_EVENT_INSTANT0("cc", "ReleaseCommitbyActivation");
+ TRACE_EVENT_INSTANT0("cc", "ReleaseCommitbyActivation",
+ TRACE_EVENT_SCOPE_THREAD);
DCHECK(layer_tree_host_impl_->settings().impl_side_painting);
completion_event_for_commit_held_on_tree_activation_->Signal();
completion_event_for_commit_held_on_tree_activation_ = NULL;
« no previous file with comments | « cc/trees/layer_tree_host_impl.cc ('k') | chrome/test/base/tracing_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698