Chromium Code Reviews| Index: base/debug/trace_event_impl.h |
| diff --git a/base/debug/trace_event_impl.h b/base/debug/trace_event_impl.h |
| index ce2e0178641e27a3ffce575dd1590b5f1c7b721e..7139457e20e71247bf9b35de834e9cf1ef066d8c 100644 |
| --- a/base/debug/trace_event_impl.h |
| +++ b/base/debug/trace_event_impl.h |
| @@ -710,7 +710,7 @@ class BASE_EXPORT TraceLog { |
| // |generation| is used in the following callbacks to check if the callback |
| // is called for the flush of the current |logged_events_|. |
| void FlushCurrentThread(int generation); |
| - void ConvertTraceEventsToTraceFormat(scoped_ptr<TraceBuffer> logged_events, |
| + void ConvertTraceEventsToTraceFormat( |
| const TraceLog::OutputCallback& flush_output_callback); |
| void FinishFlush(int generation); |
| void OnFlushTimeout(int generation); |
| @@ -749,6 +749,7 @@ class BASE_EXPORT TraceLog { |
| Mode mode_; |
| int num_traces_recorded_; |
| scoped_ptr<TraceBuffer> logged_events_; |
| + scoped_ptr<TraceBuffer> previous_logged_events_; |
|
Sami
2014/12/05 16:33:01
I'm not sure I understand why this should become a
loislo
2014/12/05 21:38:45
The compilation fails with error deeply in Bind te
Sami
2014/12/08 14:35:36
You can use Passed() to have the bind transfer own
|
| subtle::AtomicWord /* EventCallback */ event_callback_; |
| bool dispatching_to_observer_list_; |
| std::vector<EnabledStateObserver*> enabled_state_observer_list_; |