diff options
| author | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-26 00:18:38 +0000 |
|---|---|---|
| committer | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-26 00:18:38 +0000 |
| commit | 74f50486fe54b57cb9ac2813aa97ff9e5dda4c94 (patch) | |
| tree | 2c1018fdeea0e7f20385edc0d3e9ebde0d612ee2 /webkit/glue | |
| parent | 962d181a5f8b05fbf4db35cbfca08b28515d4f27 (diff) | |
| download | chromium_src-74f50486fe54b57cb9ac2813aa97ff9e5dda4c94.zip chromium_src-74f50486fe54b57cb9ac2813aa97ff9e5dda4c94.tar.gz chromium_src-74f50486fe54b57cb9ac2813aa97ff9e5dda4c94.tar.bz2 | |
Revert "Add a ConvertableToTraceFormat type to the trace framework."
Causes all performance_ui_tests to hang on linux buildbots.
BUG=230085
TBR=dsinclair@chromium.org
This reverts commit 296969e578a069f7c5155087acfef4f2a422d3cc.
Conflicts:
base/debug/trace_event.h
base/debug/trace_event_impl.cc
base/debug/trace_event_impl.h
base/debug/trace_event_unittest.cc
content/renderer/render_thread_impl.cc
Review URL: https://codereview.chromium.org/13954016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196550 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webkitplatformsupport_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc index ab795a7..a836afb 100644 --- a/webkit/glue/webkitplatformsupport_impl.cc +++ b/webkit/glue/webkitplatformsupport_impl.cc @@ -493,7 +493,7 @@ void WebKitPlatformSupportImpl::addTraceEvent( unsigned char flags) { TRACE_EVENT_API_ADD_TRACE_EVENT(phase, category_group_enabled, name, id, num_args, arg_names, arg_types, - arg_values, NULL, flags); + arg_values, flags); } |