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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/debug/trace_event.cc

Issue 11345019: Make Chrome Trace work with Android ATrace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't append arguments to name Created 8 years, 2 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
« base/debug/trace_event.h ('K') | « base/debug/trace_event.h ('k') | base/debug/trace_event_android.cc » ('j') | base/debug/trace_event_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/debug/trace_event.cc
diff --git a/base/debug/trace_event.cc b/base/debug/trace_event.cc
index be77d5ac298287c376f897c41fd7b842330cb394..4298bba93c6db60a9d7928e64ea1b7db5b406da6 100644
--- a/base/debug/trace_event.cc
+++ b/base/debug/trace_event.cc
@@ -15,7 +15,7 @@ void TraceEndOnScopeClose::Initialize(const unsigned char* category_enabled,
void TraceEndOnScopeClose::AddEventIfEnabled() {
// Only called when p_data_ is non-null.
- if (*p_data_->category_enabled) {
+ if (TRACE_EVENT_API_IS_ATRACE_ENABLED() || *p_data_->category_enabled) {
TRACE_EVENT_API_ADD_TRACE_EVENT(
TRACE_EVENT_PHASE_END,
p_data_->category_enabled,
@@ -39,7 +39,7 @@ void TraceEndOnScopeCloseThreshold::Initialize(
void TraceEndOnScopeCloseThreshold::AddEventIfEnabled() {
// Only called when p_data_ is non-null.
- if (*p_data_->category_enabled) {
+ if (TRACE_EVENT_API_IS_ATRACE_ENABLED() || *p_data_->category_enabled) {
TRACE_EVENT_API_ADD_TRACE_EVENT(
TRACE_EVENT_PHASE_END,
p_data_->category_enabled,
« base/debug/trace_event.h ('K') | « base/debug/trace_event.h ('k') | base/debug/trace_event_android.cc » ('j') | base/debug/trace_event_android.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698