content/renderer/devtools/devtools_agent.cc - Issue 12150004: Category group support/Renamings.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/devtools/devtools_agent.cc

Issue 12150004: Category group support/Renamings. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fixed comment, added better support for default filtering, fixed merge issues. Created 7 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/renderer/devtools/devtools_agent.cc

diff --git a/content/renderer/devtools/devtools_agent.cc b/content/renderer/devtools/devtools_agent.cc

index 868f5ec47bac65c81f8e2df8bfabafeb97187760..2c75ae67de4143787ea09ed134db8beeebb9f229 100644

--- a/content/renderer/devtools/devtools_agent.cc

+++ b/content/renderer/devtools/devtools_agent.cc

@@ -135,7 +135,11 @@ void DevToolsAgent::clearBrowserCookies() {

void DevToolsAgent::setTraceEventCallback(TraceEventCallback cb) {

TraceLog* trace_log = TraceLog::GetInstance();

trace_log->SetEventCallback(cb);

- trace_log->SetEnabled(!!cb, TraceLog::RECORD_UNTIL_FULL);

+ if (!!cb)

+ trace_log->SetEnabled(base::debug::CategoryFilter(),

+ TraceLog::RECORD_UNTIL_FULL);

+ else

+ trace_log->SetDisabled();

}

#if defined(USE_TCMALLOC) && !defined(OS_WIN)