From 77eecb93841e695561c7e2c56cd07ce2c732ec7e Mon Sep 17 00:00:00 2001 From: "scheib@chromium.org" Date: Thu, 5 May 2011 19:49:05 +0000 Subject: Merge gpu_trace_event back into base/debug/trace_event. Initial land attempt at http://codereview.chromium.org/6551019/ gpu_trace_event fork at http://codereview.chromium.org/6691013 - gpu_trace_event renamed to base/debug/trace_event and modified as appropriate for base::debug - Unit Tests implemented for trace_event - gpu_common library removed (was added only for gpu_trace_event) - Existing calls to trace_event suffixed with _ETW to make ETW calls (see decisions and incremental plans at end of 6551019) - GPU trace calls renamed to new calls. - Tracing switch removed from test_shell, as linux log file support removed. BUG=79509 TEST=trace_event_win_unittest and about:gpu Review URL: http://codereview.chromium.org/6862002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84284 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/tools/test_shell/test_shell_win.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webkit/tools/test_shell/test_shell_win.cc') diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc index 6b4d00f7..8245b6e 100644 --- a/webkit/tools/test_shell/test_shell_win.cc +++ b/webkit/tools/test_shell/test_shell_win.cc @@ -479,7 +479,7 @@ void TestShell::LoadURLForFrame(const GURL& url, if (!url.is_valid()) return; - TRACE_EVENT_BEGIN("url.load", this, url.spec()); + TRACE_EVENT_BEGIN_ETW("url.load", this, url.spec()); if (IsSVGTestURL(url)) { SizeToSVG(); -- cgit v1.1