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

diff --git a/content/renderer/render_thread.cc b/content/renderer/render_thread.cc

index 9471a99a23fcfc259465b8ae231cde76ab873456..c9a7052570fdae88ec811fdffb5f88eb3cf3a1c5 100644

--- a/content/renderer/render_thread.cc

+++ b/content/renderer/render_thread.cc

@@ -137,7 +137,7 @@ RenderThread::RenderThread(const std::string& channel_name)

}

void RenderThread::Init() {

- TRACE_EVENT_BEGIN("RenderThread::Init", 0, "");

+ TRACE_EVENT_BEGIN_ETW("RenderThread::Init", 0, "");

#if defined(OS_MACOSX)

// On Mac, the select popups are rendered by the browser.

@@ -169,7 +169,7 @@ void RenderThread::Init() {

content::GetContentClient()->renderer()->RenderThreadStarted();

- TRACE_EVENT_END("RenderThread::Init", 0, "");

+ TRACE_EVENT_END_ETW("RenderThread::Init", 0, "");

}

RenderThread::~RenderThread() {