diff options
| author | nduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-22 17:11:30 +0000 |
|---|---|---|
| committer | nduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-22 17:11:30 +0000 |
| commit | 372fdf6ca31e4e89093b23396b7ae1812ca20e5e (patch) | |
| tree | 42af23d6b1e39c03c499454187ff3f9f18dabb78 /webkit | |
| parent | 0ee71fe5ad57cf297382a40891b3db11c9dd021b (diff) | |
| download | chromium_src-372fdf6ca31e4e89093b23396b7ae1812ca20e5e.zip chromium_src-372fdf6ca31e4e89093b23396b7ae1812ca20e5e.tar.gz chromium_src-372fdf6ca31e4e89093b23396b7ae1812ca20e5e.tar.bz2 | |
Make WebKitClient::traceEvent issue GPU_TRACE_EVENTs.
Review URL: http://codereview.chromium.org/6715009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webkitclient_impl.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc index 3a47de4..477339a 100644 --- a/webkit/glue/webkitclient_impl.cc +++ b/webkit/glue/webkitclient_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -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" @@ -286,11 +287,15 @@ 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", StringPrintf("%p", id).c_str(), + "extra", extra ? extra : ""); } void WebKitClientImpl::traceEventEnd(const char* name, void* id, const char* extra) { TRACE_EVENT_END(name, id, extra); + GPU_TRACE_EVENT_END0("webkit", name); } namespace { |