diff options
| author | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-22 17:27:15 +0000 |
|---|---|---|
| committer | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-22 17:27:15 +0000 |
| commit | 21eec4104cff5856cda0b3a4615596813edb0d05 (patch) | |
| tree | 7d3c266ec87694fb71deda52c2ee5d1d5e47a3d0 /webkit/glue | |
| parent | 41e5a1d2f5d0ebf543f18ff8be53e8dafc3beebc (diff) | |
| download | chromium_src-21eec4104cff5856cda0b3a4615596813edb0d05.zip chromium_src-21eec4104cff5856cda0b3a4615596813edb0d05.tar.gz chromium_src-21eec4104cff5856cda0b3a4615596813edb0d05.tar.bz2 | |
Revert 78992 - Make WebKitClient::traceEvent issue GPU_TRACE_EVENTs.
Review URL: http://codereview.chromium.org/6715009
TBR=nduca@chromium.org
Review URL: http://codereview.chromium.org/6708090
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78995 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webkitclient_impl.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc index 477339a..3a47de4 100644 --- a/webkit/glue/webkitclient_impl.cc +++ b/webkit/glue/webkitclient_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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,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" @@ -287,15 +286,11 @@ 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 { |