gpu/command_buffer/service/gpu_scheduler.cc - Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event

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

Unified Diff: gpu/command_buffer/service/gpu_scheduler.cc

Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: shared dll build, phishing test shutdown crashes, tsan warnings; merge 84612 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:

Index: gpu/command_buffer/service/gpu_scheduler.cc

diff --git a/gpu/command_buffer/service/gpu_scheduler.cc b/gpu/command_buffer/service/gpu_scheduler.cc

index 09a24fd924ba4350b75d07420ef921e28b440447..059cc8f2750ccbdaf87effead1c8ee255ee5e02c 100644

--- a/gpu/command_buffer/service/gpu_scheduler.cc

+++ b/gpu/command_buffer/service/gpu_scheduler.cc

@@ -6,8 +6,8 @@

#include "base/callback.h"

#include "base/compiler_specific.h"

+#include "base/debug/trace_event.h"

#include "base/message_loop.h"

-#include "gpu/common/gpu_trace_event.h"

#include "ui/gfx/gl/gl_context.h"

#include "ui/gfx/gl/gl_bindings.h"

@@ -128,7 +128,7 @@ void GpuScheduler::PutChanged(bool sync) {

}

void GpuScheduler::ProcessCommands() {

- GPU_TRACE_EVENT0("gpu", "GpuScheduler:ProcessCommands");

+ TRACE_EVENT0("gpu", "GpuScheduler:ProcessCommands");

CommandBuffer::State state = command_buffer_->GetState();

if (state.error != error::kNoError)

return;