summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-22 03:16:58 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-22 03:16:58 +0000
commited16df27531f0b7da10143477d6e2eda862d94f0 (patch)
tree355fd6fa6f77557479a751bdc1caabb30e3b994e /webkit
parent16632a8efab4883a7e0af4f1ca4d3c3e1267e8a6 (diff)
downloadchromium_src-ed16df27531f0b7da10143477d6e2eda862d94f0.zip
chromium_src-ed16df27531f0b7da10143477d6e2eda862d94f0.tar.gz
chromium_src-ed16df27531f0b7da10143477d6e2eda862d94f0.tar.bz2
Revert 82620 - Replaced std::string argument storage in gpu_trace_event with faster TraceAnyTypeBUG=80172TEST=Review URL: http://codereview.chromium.org/6877101
TBR=jbates@chromium.org Review URL: http://codereview.chromium.org/6896016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82621 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webkitclient_impl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index b2dd53a..4e2b10a 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -286,7 +286,7 @@ 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,
+ "id", StringPrintf("%p", id).c_str(),
"extra", extra ? extra : "");
}