diff options
| author | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 02:23:58 +0000 |
|---|---|---|
| committer | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 02:23:58 +0000 |
| commit | 366ae2448ddfcd11eb827205aa56c8c0c00442bb (patch) | |
| tree | e86ee956eabead718e6f0fdf0e2f64bd6292688f /webkit/glue | |
| parent | dc2bfb7bfa996045733f6afc849a4923589a53b7 (diff) | |
| download | chromium_src-366ae2448ddfcd11eb827205aa56c8c0c00442bb.zip chromium_src-366ae2448ddfcd11eb827205aa56c8c0c00442bb.tar.gz chromium_src-366ae2448ddfcd11eb827205aa56c8c0c00442bb.tar.bz2 | |
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
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=84284
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=84486
Review URL: http://codereview.chromium.org/6862002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84739 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 1 | ||||
| -rw-r--r-- | webkit/glue/webkitclient_impl.cc | 9 |
2 files changed, 2 insertions, 8 deletions
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 74772cc..23b9634 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -107,7 +107,6 @@ 'dependencies': [ '<(DEPTH)/app/app.gyp:app_base', '<(DEPTH)/base/base.gyp:base_i18n', - '<(DEPTH)/gpu/gpu.gyp:gpu_common', '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', '<(DEPTH)/net/net.gyp:net', '<(DEPTH)/ppapi/ppapi.gyp:ppapi_shared_impl', diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc index 882cb42..4244bc3f 100644 --- a/webkit/glue/webkitclient_impl.cc +++ b/webkit/glue/webkitclient_impl.cc @@ -25,7 +25,6 @@ #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" @@ -284,16 +283,12 @@ void WebKitClientImpl::histogramEnumeration( void WebKitClientImpl::traceEventBegin(const char* name, void* id, const char* extra) { - TRACE_EVENT_BEGIN(name, id, extra); - GPU_TRACE_EVENT_BEGIN2("webkit", name, - "id", id, - "extra", extra ? extra : ""); + TRACE_EVENT_BEGIN_ETW(name, id, extra); } void WebKitClientImpl::traceEventEnd(const char* name, void* id, const char* extra) { - TRACE_EVENT_END(name, id, extra); - GPU_TRACE_EVENT_END0("webkit", name); + TRACE_EVENT_END_ETW(name, id, extra); } namespace { |