gpu/common/gpu_trace_event.cc - Issue 6933035: Revert 84284 - Merge gpu_trace_event back into base/debug/trace_event.Initial land attempt at htt...

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: gpu/common/gpu_trace_event.cc

Issue 6933035: Revert 84284 - Merge gpu_trace_event back into base/debug/trace_event.Initial land attempt at htt... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 7 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

Property Changes:

Added: svn:mergeinfo

« no previous file with comments | « gpu/common/gpu_trace_event.h ('k') | gpu/gpu.gyp » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 "gpu/common/gpu_trace_event.h"	5 #include "gpu/common/gpu_trace_event.h"

6	6

7 #include "base/format_macros.h"	7 #include "base/format_macros.h"

8 #include "base/process_util.h"	8 #include "base/process_util.h"

9 #include "base/stringprintf.h"	9 #include "base/stringprintf.h"

10 #include "base/utf_string_conversions.h"	10 #include "base/utf_string_conversions.h"

(...skipping 310 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
321 event.argValues[0] = arg1val;	321 event.argValues[0] = arg1val;

322 event.argNames[1] = arg2name;	322 event.argNames[1] = arg2name;

323 event.argValues[1] = arg2val;	323 event.argValues[1] = arg2val;

324 COMPILE_ASSERT(TRACE_MAX_NUM_ARGS == 2, TraceEvent_arc_count_out_of_sync);	324 COMPILE_ASSERT(TRACE_MAX_NUM_ARGS == 2, TraceEvent_arc_count_out_of_sync);

325 if (logged_events_.size() == TRACE_EVENT_BUFFER_SIZE &&	325 if (logged_events_.size() == TRACE_EVENT_BUFFER_SIZE &&

326 buffer_full_callback_.get())	326 buffer_full_callback_.get())

327 buffer_full_callback_->Run();	327 buffer_full_callback_->Run();

328 }	328 }

329	329

330 } // namespace gpu	330 } // namespace gpu

OLD	NEW