diff options
| author | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-06 20:30:09 +0000 |
|---|---|---|
| committer | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-06 20:30:09 +0000 |
| commit | 5ae1f730fffdc5b06423a92acc8e004ce4b6bc64 (patch) | |
| tree | 7aafbabace87609d656457813309c2fb691f2049 /webkit/tools/test_shell/test_shell_win.cc | |
| parent | ff24f49bedc612731ed5632391ce4325698ae8dc (diff) | |
| download | chromium_src-5ae1f730fffdc5b06423a92acc8e004ce4b6bc64.zip chromium_src-5ae1f730fffdc5b06423a92acc8e004ce4b6bc64.tar.gz chromium_src-5ae1f730fffdc5b06423a92acc8e004ce4b6bc64.tar.bz2 | |
Revert 84486 - 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=79509TEST=trace_event_win_unittest and about:gpuCommitted: http://src.chromium.org/viewvc/chrome?view=rev&revision=84284Review URL: http://codereview.chromium.org/6862002
TBR=scheib@chromium.org
Review URL: http://codereview.chromium.org/6955006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84494 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell_win.cc')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_win.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc index 8245b6e..6b4d00f7 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_ETW("url.load", this, url.spec()); + TRACE_EVENT_BEGIN("url.load", this, url.spec()); if (IsSVGTestURL(url)) { SizeToSVG(); |