Commit 97a081a5 authored by caseq@chromium.org's avatar caseq@chromium.org

DevTools: switch devtools platform events to new timeline category

This switches trace events emitted from PlatformInstrumentation to use
trace event category consistent with the trace-based timeline.
Drive-by: fix category filter in TraceEventDispatcher.

BUG=361045

Review URL: https://codereview.chromium.org/337143002

git-svn-id: svn://svn.chromium.org/blink/trunk@176413 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent a35b6d64
...@@ -100,7 +100,7 @@ void TraceEventDispatcher::processBackgroundEvents() ...@@ -100,7 +100,7 @@ void TraceEventDispatcher::processBackgroundEvents()
void TraceEventDispatcher::innerAddListener(const char* name, char phase, TraceEventTargetBase* instance, TraceEventHandlerMethod method, InspectorClient* client) void TraceEventDispatcher::innerAddListener(const char* name, char phase, TraceEventTargetBase* instance, TraceEventHandlerMethod method, InspectorClient* client)
{ {
static const char CategoryFilter[] = "devtools,disabled-by-default.devtools.timeline,disabled-by-default.devtools.timeline.frame"; static const char CategoryFilter[] = "-*," TRACE_DISABLED_BY_DEFAULT("devtools.timeline") "," TRACE_DISABLED_BY_DEFAULT("devtools.timeline.frame");
ASSERT(isMainThread()); ASSERT(isMainThread());
MutexLocker locker(m_mutex); MutexLocker locker(m_mutex);
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
namespace WebCore { namespace WebCore {
const char PlatformInstrumentation::CategoryName[] = "devtools"; const char PlatformInstrumentation::CategoryName[] = TRACE_DISABLED_BY_DEFAULT("devtools.timeline");
const char PlatformInstrumentation::ImageDecodeEvent[] = "Decode Image"; const char PlatformInstrumentation::ImageDecodeEvent[] = "Decode Image";
const char PlatformInstrumentation::ImageResizeEvent[] = "Resize Image"; const char PlatformInstrumentation::ImageResizeEvent[] = "Resize Image";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment