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

Side by Side Diff: base/debug/trace_event.cc

Issue 11782008: Revert 175233 because Linux ASAN builder cannot compile it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/debug/trace_event.h ('k') | base/debug/trace_event_internal.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/debug/trace_event.h" 5 #include "base/debug/trace_event.h"
6 6
7 namespace trace_event_internal { 7 namespace trace_event_internal {
8 8
9 void TraceEndOnScopeClose::Initialize(const unsigned char* category_enabled, 9 void TraceEndOnScopeClose::Initialize(const unsigned char* category_enabled,
10 const char* name) { 10 const char* name) {
11 data_.category_enabled = category_enabled; 11 data_.category_enabled = category_enabled;
12 data_.name = name; 12 data_.name = name;
13 p_data_ = &data_; 13 p_data_ = &data_;
14 } 14 }
15 15
16 void TraceEndOnScopeClose::AddEventIfEnabled() { 16 void TraceEndOnScopeClose::AddEventIfEnabled() {
17 // Only called when p_data_ is non-null. 17 // Only called when p_data_ is non-null.
18 if (*p_data_->category_enabled) { 18 if (*p_data_->category_enabled) {
19 TRACE_EVENT_API_ADD_TRACE_EVENT( 19 TRACE_EVENT_API_ADD_TRACE_EVENT(
20 TRACE_EVENT_PHASE_END, 20 TRACE_EVENT_PHASE_END,
21 p_data_->category_enabled, 21 p_data_->category_enabled,
22 p_data_->name, kNoEventId, 22 p_data_->name, kNoEventId,
23 kZeroNumArgs, NULL, NULL, NULL, 23 kZeroNumArgs, NULL, NULL, NULL,
24 TRACE_EVENT_FLAG_NONE); 24 TRACE_EVENT_FLAG_NONE);
25 } 25 }
26 } 26 }
27 27
28 } // namespace trace_event_internal 28 } // namespace trace_event_internal
OLDNEW
« no previous file with comments | « base/debug/trace_event.h ('k') | base/debug/trace_event_internal.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698