summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-13 03:12:44 +0000
committerjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-13 03:12:44 +0000
commit761550737a7bd68856f2a28fe389b23d135ddcc2 (patch)
tree2ee375731da5c2cb4681a04c096f3b34a0f51146 /webkit
parent19f9f17b1b18771f39d36087bf24bec8cd3bf98c (diff)
downloadchromium_src-761550737a7bd68856f2a28fe389b23d135ddcc2.zip
chromium_src-761550737a7bd68856f2a28fe389b23d135ddcc2.tar.gz
chromium_src-761550737a7bd68856f2a28fe389b23d135ddcc2.tar.bz2
Allow tracing in third_party libraries
This is step 1 -- refactor the code to allow us to split up trace_event.h into trace_event.h and trace_event_export.h/cc. Step 2 is to cut out trace_event_export.h/cc. The _export.h/cc will be laid out so they can be copied to other third_party libraries and then tweaked to call through to chromium's internal tracing API via platform APIs or function pointers. To make these APIs easily exportable, this change primarily aims to eliminate the custom objects (ie: TraceValue) and types that will cause problems when defined in multiple libraries. The macros and internal namespace are destined for trace_event_export.h/cc in a future CL. BUG=109779 Review URL: http://codereview.chromium.org/9155024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117598 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webkitplatformsupport_impl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc
index 811fc5a..91280b1 100644
--- a/webkit/glue/webkitplatformsupport_impl.cc
+++ b/webkit/glue/webkitplatformsupport_impl.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -292,7 +292,7 @@ void WebKitPlatformSupportImpl::histogramEnumeration(
}
bool WebKitPlatformSupportImpl::isTraceEventEnabled() const {
- return base::debug::TraceLog::GetCategory("webkit")->enabled;
+ return !!*base::debug::TraceLog::GetCategoryEnabled("webkit");
}
void WebKitPlatformSupportImpl::traceEventBegin(const char* name, void* id,