content/browser/gpu_process_host.cc - Issue 6933035: Revert 84284 - 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/browser/gpu_process_host.cc

Issue 6933035: Revert 84284 - 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, 8 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/browser/gpu_process_host.cc

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

--- content/browser/gpu_process_host.cc (revision 84291)

+++ content/browser/gpu_process_host.cc (working copy)

@@ -5,7 +5,6 @@

#include "content/browser/gpu_process_host.h"

#include "base/command_line.h"

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

#include "base/memory/ref_counted.h"

#include "base/metrics/histogram.h"

#include "base/process_util.h"

@@ -19,6 +18,7 @@

#include "content/browser/renderer_host/render_widget_host.h"

#include "content/browser/renderer_host/render_widget_host_view.h"

#include "content/common/gpu/gpu_messages.h"

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

#include "ipc/ipc_channel_handle.h"

#include "ipc/ipc_switches.h"

#include "media/base/media_switches.h"

@@ -286,7 +286,7 @@

int renderer_id,

EstablishChannelCallback *callback) {

DCHECK(CalledOnValidThread());

- TRACE_EVENT0("gpu", "GpuProcessHostUIShim::EstablishGpuChannel");

+ GPU_TRACE_EVENT0("gpu", "GpuProcessHostUIShim::EstablishGpuChannel");

linked_ptr<EstablishChannelCallback> wrapped_callback(callback);

// If GPU features are already blacklisted, no need to establish the channel.

« no previous file with comments | « chrome_frame/chrome_frame_automation.cc ('k') | content/browser/gpu_process_host_ui_shim.cc » ('j') | no next file with comments »