content/browser/trace_message_filter.cc - Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event

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/browser/trace_message_filter.cc

Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: shared dll build, phishing test shutdown crashes, tsan warnings; merge 84612 Created 9 years, 7 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/browser/trace_message_filter.cc

diff --git a/content/browser/trace_message_filter.cc b/content/browser/trace_message_filter.cc

index e23fc2697806fe2e2b5b306fe2915d642774634e..a1bd1d0ef23701defc3a0ecf4fadd32395669a68 100644

--- a/content/browser/trace_message_filter.cc

+++ b/content/browser/trace_message_filter.cc

@@ -82,7 +82,8 @@ void TraceMessageFilter::OnEndTracingAck() {

}

void TraceMessageFilter::OnTraceDataCollected(const std::string& data) {

- TraceController::GetInstance()->OnTraceDataCollected(data);

+ TraceController::GetInstance()->OnTraceDataCollected(

+ make_scoped_refptr(new base::debug::TraceLog::RefCountedString(data)));

}

void TraceMessageFilter::OnTraceBufferFull() {