content/renderer/command_buffer_proxy.cc - Issue 6955006: Revert 84486 - Merge gpu_trace_event back into base/debug/trace_event.Initial land attempt at htt...

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: content/renderer/command_buffer_proxy.cc

Issue 6955006: Revert 84486 - 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 side-by-side diff with in-line comments

Download patch

Index: content/renderer/command_buffer_proxy.cc

===================================================================

--- content/renderer/command_buffer_proxy.cc (revision 84493)

+++ content/renderer/command_buffer_proxy.cc (working copy)

@@ -4,7 +4,6 @@

#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"

@@ -15,6 +14,7 @@

#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 @@

gpu::CommandBuffer::State CommandBufferProxy::FlushSync(int32 put_offset,

int32 last_known_get) {

- TRACE_EVENT0("gpu", "CommandBufferProxy::FlushSync");

+ GPU_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) {

« no previous file with comments | « content/common/gpu/gpu_command_buffer_stub.cc ('k') | content/renderer/render_thread.cc » ('j') | no next file with comments »