Commit 9154f23b authored by caseq@chromium.org's avatar caseq@chromium.org

Timeline: add disabled-by-default-devtools.timeline{,.frame} to category filter

This prepares inspector for switching chromium-side trace events used
for building timeline to the category names consistent with the rest of
timeline trace-based instrumentation in blink.

BUG=361045

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

git-svn-id: svn://svn.chromium.org/blink/trunk@175891 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent ae1cd304
......@@ -100,7 +100,7 @@ void TraceEventDispatcher::processBackgroundEvents()
void TraceEventDispatcher::innerAddListener(const char* name, char phase, TraceEventTargetBase* instance, TraceEventHandlerMethod method, InspectorClient* client)
{
static const char CategoryFilter[] = "devtools";
static const char CategoryFilter[] = "devtools,disabled-by-default.devtools.timeline,disabled-by-default.devtools.timeline.frame";
ASSERT(isMainThread());
MutexLocker locker(m_mutex);
......
......@@ -92,7 +92,7 @@ WebInspector.TracingTimelineModel.RecordType = {
LayerTreeHostImplSnapshot: "cc::LayerTreeHostImpl"
};
WebInspector.TracingTimelineModel.defaultTracingCategoryFilter = "*,disabled-by-default-cc.debug,disabled-by-default-devtools.timeline";
WebInspector.TracingTimelineModel.defaultTracingCategoryFilter = "*,disabled-by-default-cc.debug,disabled-by-default-devtools.timeline,disabled-by-default-devtools.timeline.frame";
WebInspector.TracingTimelineModel.prototype = {
/**
......@@ -106,7 +106,7 @@ WebInspector.TracingTimelineModel.prototype = {
if (WebInspector.experimentsSettings.timelineTracingMode.isEnabled()) {
categories = WebInspector.TracingTimelineModel.defaultTracingCategoryFilter;
} else {
var categoriesArray = ["disabled-by-default-devtools.timeline", "devtools"];
var categoriesArray = ["disabled-by-default-devtools.timeline", "disabled-by-default-devtools.timeline.frame", "devtools"];
if (captureStacks)
categoriesArray.push("disabled-by-default-devtools.timeline.stack");
categories = categoriesArray.join(",");
......
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