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
diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc
index f61ebe02..f4e0ddc 100644
--- a/content/common/gpu/gpu_command_buffer_stub.cc
+++ b/content/common/gpu/gpu_command_buffer_stub.cc
@@ -5,6 +5,7 @@
#if defined(ENABLE_GPU)
#include "base/bind.h"
+#include "base/debug/trace_event.h"
#include "base/process_util.h"
#include "base/shared_memory.h"
#include "build/build_config.h"
@@ -15,7 +16,6 @@
#include "content/common/gpu/gpu_messages.h"
#include "content/common/gpu/gpu_watchdog.h"
#include "gpu/command_buffer/common/constants.h"
-#include "gpu/common/gpu_trace_event.h"
#include "ui/gfx/gl/gl_context.h"
#include "ui/gfx/gl/gl_surface.h"
@@ -200,7 +200,7 @@
void GpuCommandBufferStub::OnFlush(int32 put_offset,
int32 last_known_get,
IPC::Message* reply_message) {
- GPU_TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnFlush");
+ TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnFlush");
gpu::CommandBuffer::State state = command_buffer_->FlushSync(put_offset,
last_known_get);
if (state.error == gpu::error::kLostContext &&
@@ -212,7 +212,7 @@
}
void GpuCommandBufferStub::OnAsyncFlush(int32 put_offset) {
- GPU_TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnAsyncFlush");
+ TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnAsyncFlush");
command_buffer_->Flush(put_offset);
// TODO(piman): Do this everytime the scheduler finishes processing a batch of
// commands.
@@ -291,7 +291,7 @@
}
void GpuCommandBufferStub::OnSwapBuffers() {
- GPU_TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnSwapBuffers");
+ TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnSwapBuffers");
ReportState();
Send(new GpuCommandBufferMsg_SwapBuffers(route_id_));
}
