diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 1 | ||||
| -rw-r--r-- | webkit/glue/webkitclient_impl.cc | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 3172fea..942d829 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -159,6 +159,7 @@ '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 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 { |