webkit/glue/webkitclient_impl.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: webkit/glue/webkitclient_impl.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: webkit/glue/webkitclient_impl.cc

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

--- webkit/glue/webkitclient_impl.cc (revision 84291)

+++ webkit/glue/webkitclient_impl.cc (working copy)

@@ -25,6 +25,7 @@

#include "base/synchronization/lock.h"

#include "base/time.h"

#include "base/utf_string_conversions.h"

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

#include "grit/webkit_chromium_resources.h"

#include "grit/webkit_resources.h"

#include "grit/webkit_strings.h"

@@ -283,12 +284,16 @@

void WebKitClientImpl::traceEventBegin(const char* name, void* id,

const char* extra) {

- TRACE_EVENT_BEGIN_ETW(name, id, extra);

+ TRACE_EVENT_BEGIN(name, id, extra);

+ GPU_TRACE_EVENT_BEGIN2("webkit", name,

+ "id", id,

+ "extra", extra ? extra : "");

}

void WebKitClientImpl::traceEventEnd(const char* name, void* id,

const char* extra) {

- TRACE_EVENT_END_ETW(name, id, extra);

+ TRACE_EVENT_END(name, id, extra);

+ GPU_TRACE_EVENT_END0("webkit", name);

}

namespace {

« no previous file with comments | « webkit/glue/webkit_glue.gypi ('k') | webkit/tools/test_shell/test_shell_main.cc » ('j') | no next file with comments »