Skip to content

Commit

Permalink
Merge gpu_trace_event back into base/debug/trace_event.
Browse files Browse the repository at this point in the history
Initial land attempt at http://codereview.chromium.org/6551019/
gpu_trace_event fork at http://codereview.chromium.org/6691013

- gpu_trace_event renamed to base/debug/trace_event and modified as appropriate for base::debug
- Unit Tests implemented for trace_event
- gpu_common library removed (was added only for gpu_trace_event)
- Existing calls to trace_event suffixed with _ETW to make ETW calls (see decisions and incremental plans at end of 6551019)
- GPU trace calls renamed to new calls.
- Tracing switch removed from test_shell, as linux log file support removed.

BUG=79509
TEST=trace_event_win_unittest and about:gpu

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=84284

Review URL: http://codereview.chromium.org/6862002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84486 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
scheib@chromium.org committed May 6, 2011
1 parent 91c3c30 commit 820d851
Show file tree
Hide file tree
Showing 49 changed files with 1,392 additions and 1,258 deletions.
1 change: 1 addition & 0 deletions base/base.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
'cpu_unittest.cc',
'debug/leak_tracker_unittest.cc',
'debug/stack_trace_unittest.cc',
'debug/trace_event_unittest.cc',
'debug/trace_event_win_unittest.cc',
'dir_reader_posix_unittest.cc',
'environment_unittest.cc',
Expand Down
1 change: 0 additions & 1 deletion base/base.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,6 @@
# regression to page cycler moz.
'sha1_win.cc',
'string16.cc',
'debug/trace_event.cc',
],
},],
['OS=="freebsd" or OS=="openbsd"', {
Expand Down
Loading

0 comments on commit 820d851

Please sign in to comment.