summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-25 04:30:01 +0000
committerjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-25 04:30:01 +0000
commit76cc150554e53ef3aa59bdb18f5a88644199986d (patch)
tree656bbfac77cb777968f2a6ff89721e467a315e3f /webkit
parent1a6ad5fc4225dd2523e18efc11162fe3c1113a46 (diff)
downloadchromium_src-76cc150554e53ef3aa59bdb18f5a88644199986d.zip
chromium_src-76cc150554e53ef3aa59bdb18f5a88644199986d.tar.gz
chromium_src-76cc150554e53ef3aa59bdb18f5a88644199986d.tar.bz2
Cleanup trace_event, fix webkit API naming.
Remove unused TRACE_EVENT_API_ADD_COUNTER_EVENT and improve comments in trace_event.h. Review URL: http://codereview.chromium.org/9234007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118999 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webkitplatformsupport_impl.cc2
-rw-r--r--webkit/glue/webkitplatformsupport_impl.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc
index f55ecb6..83c74e3 100644
--- a/webkit/glue/webkitplatformsupport_impl.cc
+++ b/webkit/glue/webkitplatformsupport_impl.cc
@@ -305,7 +305,7 @@ void WebKitPlatformSupportImpl::traceEventEnd(const char* name, void* id,
TRACE_EVENT_END_ETW(name, id, extra);
}
-const unsigned char* WebKitPlatformSupportImpl::getCategoryEnabled(
+const unsigned char* WebKitPlatformSupportImpl::getTraceCategoryEnabledFlag(
const char* category_name) {
return TRACE_EVENT_API_GET_CATEGORY_ENABLED(category_name);
}
diff --git a/webkit/glue/webkitplatformsupport_impl.h b/webkit/glue/webkitplatformsupport_impl.h
index ad9c4a7..9becc07 100644
--- a/webkit/glue/webkitplatformsupport_impl.h
+++ b/webkit/glue/webkitplatformsupport_impl.h
@@ -73,7 +73,8 @@ class WEBKIT_GLUE_EXPORT WebKitPlatformSupportImpl :
virtual bool isTraceEventEnabled() const;
virtual void traceEventBegin(const char* name, void* id, const char* extra);
virtual void traceEventEnd(const char* name, void* id, const char* extra);
- virtual const unsigned char* getCategoryEnabled(const char* category_name);
+ virtual const unsigned char* getTraceCategoryEnabledFlag(
+ const char* category_name);
virtual int addTraceEvent(
char phase,
const unsigned char* category_enabled,