Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1628)

Unified Diff: content/browser/tracing/tracing_ui.cc

Issue 12096115: Update tracing framework to optionally use a ringbuffer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/tracing/tracing_ui.cc
diff --git a/content/browser/tracing/tracing_ui.cc b/content/browser/tracing/tracing_ui.cc
index b82da36160152477d17794866864a1b93f497bde..069c2b9c8b54dc09c21312b1710ae34854cd883b 100644
--- a/content/browser/tracing/tracing_ui.cc
+++ b/content/browser/tracing/tracing_ui.cc
@@ -370,7 +370,8 @@ void TracingMessageHandler::SaveTraceFileComplete() {
void TracingMessageHandler::OnBeginTracing(const ListValue* args) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- DCHECK_EQ(args->GetSize(), (size_t) 2);
+ DCHECK_GE(args->GetSize(), (size_t) 2);
+ DCHECK_LE(args->GetSize(), (size_t) 3);
bool system_tracing_requested = false;
bool ok = args->GetBoolean(0, &system_tracing_requested);
@@ -380,12 +381,19 @@ void TracingMessageHandler::OnBeginTracing(const ListValue* args) {
ok = args->GetString(1, &chrome_categories);
DCHECK(ok);
+ bool continuous_tracing = false;
+ if (args->GetSize() == 3) {
+ ok = args->GetBoolean(2, &continuous_tracing);
+ DCHECK(ok);
+ }
+
trace_enabled_ = true;
// TODO(jbates) This may fail, but that's OK for current use cases.
// Ex: Multiple about:gpu traces can not trace simultaneously.
// TODO(nduca) send feedback to javascript about whether or not BeginTracing
// was successful.
- TraceController::GetInstance()->BeginTracing(this, chrome_categories);
+ TraceController::GetInstance()->BeginTracing(this, chrome_categories,
+ continuous_tracing);
if (system_tracing_requested) {
#if defined(OS_CHROMEOS)

Powered by Google App Engine
This is Rietveld 408576698