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

Unified Diff: trunk/src/content/browser/tracing/tracing_controller_impl.cc

Issue 122053002: Revert 242671 "Implement sampling profiler (chromium side change)" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years 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: trunk/src/content/browser/tracing/tracing_controller_impl.cc
===================================================================
--- trunk/src/content/browser/tracing/tracing_controller_impl.cc (revision 242678)
+++ trunk/src/content/browser/tracing/tracing_controller_impl.cc (working copy)
@@ -80,7 +80,7 @@
void TracingControllerImpl::ResultFile::WriteTask(
const scoped_refptr<base::RefCountedString>& events_str_ptr) {
- if (!file_ || !events_str_ptr->data().size())
+ if (!file_)
return;
// If there is already a result in the file, then put a commma
@@ -173,9 +173,7 @@
// TODO(haraken): How to handle ENABLE_SYSTRACE?
TraceLog::GetInstance()->SetEnabled(
- base::debug::CategoryFilter(category_filter),
- base::debug::TraceLog::RECORDING_MODE,
- trace_options);
+ base::debug::CategoryFilter(category_filter), trace_options);
is_recording_ = true;
// Notify all child processes.
@@ -249,11 +247,10 @@
int monitoring_tracing_options = 0;
if (options & ENABLE_SAMPLING)
- monitoring_tracing_options |= base::debug::TraceLog::ENABLE_SAMPLING;
+ monitoring_tracing_options |= base::debug::TraceLog::MONITOR_SAMPLING;
TraceLog::GetInstance()->SetEnabled(
base::debug::CategoryFilter(category_filter),
- base::debug::TraceLog::MONITORING_MODE,
static_cast<TraceLog::Options>(monitoring_tracing_options));
// Notify all child processes.
@@ -428,11 +425,6 @@
TraceLog::GetInstance()->GetCurrentCategoryFilter().ToString(),
TraceLog::GetInstance()->trace_options());
}
- if (can_disable_monitoring()) {
- trace_message_filter->SendEnableMonitoring(
- TraceLog::GetInstance()->GetCurrentCategoryFilter().ToString(),
- TraceLog::GetInstance()->trace_options());
- }
}
void TracingControllerImpl::RemoveTraceMessageFilter(
« no previous file with comments | « trunk/src/content/browser/media/webrtc_browsertest.cc ('k') | trunk/src/content/browser/tracing/tracing_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698