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

Unified Diff: content/browser/trace_subscriber_stdio.cc

Issue 10797012: Fix memory leak in TraceSubscriberStdioImpl. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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
« no previous file with comments | « no previous file | tools/valgrind/memcheck/suppressions.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/trace_subscriber_stdio.cc
diff --git a/content/browser/trace_subscriber_stdio.cc b/content/browser/trace_subscriber_stdio.cc
index e390212b8fe4085ea625a1a122085a62d7704c3b..a102810824326c39e2819d1ae4fbbb8bd97672ea 100644
--- a/content/browser/trace_subscriber_stdio.cc
+++ b/content/browser/trace_subscriber_stdio.cc
@@ -58,6 +58,9 @@ class TraceSubscriberStdioImpl
fclose(file_);
file_ = 0;
}
+ // This is important, as it breaks a reference cycle.
+ trace_buffer_.SetOutputCallback(
+ base::debug::TraceResultBuffer::OutputCallback());
}
void Write(const std::string& output_str) {
@@ -79,7 +82,7 @@ TraceSubscriberStdio::TraceSubscriberStdio(const FilePath& path)
: impl_(new TraceSubscriberStdioImpl(path)) {
BrowserThread::PostBlockingPoolSequencedTask(
__FILE__, FROM_HERE,
- base::Bind(&TraceSubscriberStdioImpl::OnStart, impl_.get()));
+ base::Bind(&TraceSubscriberStdioImpl::OnStart, impl_));
}
TraceSubscriberStdio::~TraceSubscriberStdio() {
@@ -88,14 +91,14 @@ TraceSubscriberStdio::~TraceSubscriberStdio() {
void TraceSubscriberStdio::OnEndTracingComplete() {
BrowserThread::PostBlockingPoolSequencedTask(
__FILE__, FROM_HERE,
- base::Bind(&TraceSubscriberStdioImpl::OnEnd, impl_.get()));
+ base::Bind(&TraceSubscriberStdioImpl::OnEnd, impl_));
}
void TraceSubscriberStdio::OnTraceDataCollected(
const scoped_refptr<base::RefCountedString>& data_ptr) {
BrowserThread::PostBlockingPoolSequencedTask(
__FILE__, FROM_HERE,
- base::Bind(&TraceSubscriberStdioImpl::OnData, impl_.get(), data_ptr));
+ base::Bind(&TraceSubscriberStdioImpl::OnData, impl_, data_ptr));
}
} // namespace content
« no previous file with comments | « no previous file | tools/valgrind/memcheck/suppressions.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698