diff options
| author | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 02:23:58 +0000 |
|---|---|---|
| committer | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 02:23:58 +0000 |
| commit | 366ae2448ddfcd11eb827205aa56c8c0c00442bb (patch) | |
| tree | e86ee956eabead718e6f0fdf0e2f64bd6292688f /content/renderer/command_buffer_proxy.cc | |
| parent | dc2bfb7bfa996045733f6afc849a4923589a53b7 (diff) | |
| download | chromium_src-366ae2448ddfcd11eb827205aa56c8c0c00442bb.zip chromium_src-366ae2448ddfcd11eb827205aa56c8c0c00442bb.tar.gz chromium_src-366ae2448ddfcd11eb827205aa56c8c0c00442bb.tar.bz2 | |
Merge gpu_trace_event back into base/debug/trace_event.
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
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=84486
Review URL: http://codereview.chromium.org/6862002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84739 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/command_buffer_proxy.cc')
| -rw-r--r-- | content/renderer/command_buffer_proxy.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/renderer/command_buffer_proxy.cc b/content/renderer/command_buffer_proxy.cc index 6a1c06c..e50f0e4 100644 --- a/content/renderer/command_buffer_proxy.cc +++ b/content/renderer/command_buffer_proxy.cc @@ -4,6 +4,7 @@ #include "content/renderer/command_buffer_proxy.h" +#include "base/debug/trace_event.h" #include "base/logging.h" #include "base/process_util.h" #include "base/shared_memory.h" @@ -14,7 +15,6 @@ #include "content/renderer/plugin_channel_host.h" #include "content/renderer/render_thread.h" #include "gpu/command_buffer/common/cmd_buffer_common.h" -#include "gpu/common/gpu_trace_event.h" #include "ui/gfx/size.h" using gpu::Buffer; @@ -158,7 +158,7 @@ void CommandBufferProxy::Flush(int32 put_offset) { gpu::CommandBuffer::State CommandBufferProxy::FlushSync(int32 put_offset, int32 last_known_get) { - GPU_TRACE_EVENT0("gpu", "CommandBufferProxy::FlushSync"); + TRACE_EVENT0("gpu", "CommandBufferProxy::FlushSync"); if (last_known_get == last_state_.get_offset) { // Send will flag state with lost context if IPC fails. if (last_state_.error == gpu::error::kNoError) { |