| Index: base/debug/trace_event_impl.cc
|
| diff --git a/base/debug/trace_event_impl.cc b/base/debug/trace_event_impl.cc
|
| index 6e3516e2c2bface6552466a6828ff201a8a97bee..5cc28e9cfc939e11e372b0c4f1af408c1365f833 100644
|
| --- a/base/debug/trace_event_impl.cc
|
| +++ b/base/debug/trace_event_impl.cc
|
| @@ -1050,6 +1050,8 @@ void TraceLog::SetEventCallback(EventCallback cb) {
|
| };
|
|
|
| void TraceLog::Flush(const TraceLog::OutputCallback& cb) {
|
| + // Ignore memory allocations from here down.
|
| + TRACE_MEMORY(TRACE_DISABLED_BY_DEFAULT("memory"), TRACE_MEMORY_IGNORE);
|
| scoped_ptr<TraceBuffer> previous_logged_events;
|
| {
|
| AutoLock lock(lock_);
|
|
|