| Index: content/browser/devtools/protocol/tracing_handler.h
|
| diff --git a/content/browser/devtools/protocol/tracing_handler.h b/content/browser/devtools/protocol/tracing_handler.h
|
| index 4a80351a0e700eb53df113b72f64463e8590a295..ab50c334d17c7ac9745d62108fdf11d424d334b6 100644
|
| --- a/content/browser/devtools/protocol/tracing_handler.h
|
| +++ b/content/browser/devtools/protocol/tracing_handler.h
|
| @@ -20,6 +20,9 @@ class Timer;
|
|
|
| namespace content {
|
| namespace devtools {
|
| +
|
| +class DevToolsIOContext;
|
| +
|
| namespace tracing {
|
|
|
| class TracingHandler {
|
| @@ -27,7 +30,7 @@ class TracingHandler {
|
| typedef DevToolsProtocolClient::Response Response;
|
|
|
| enum Target { Browser, Renderer };
|
| - explicit TracingHandler(Target target);
|
| + TracingHandler(Target target, DevToolsIOContext* io_context);
|
| virtual ~TracingHandler();
|
|
|
| void SetClient(scoped_ptr<Client> client);
|
| @@ -35,14 +38,18 @@ class TracingHandler {
|
|
|
| void OnTraceDataCollected(const std::string& trace_fragment);
|
| void OnTraceComplete();
|
| + void OnTraceToStreamComplete(const std::string& stream_id);
|
|
|
| + // Protocol methods.
|
| Response Start(DevToolsCommandId command_id,
|
| const std::string* categories,
|
| const std::string* options,
|
| const double* buffer_usage_reporting_interval);
|
| Response End(DevToolsCommandId command_id);
|
| + Response End(DevToolsCommandId command_id, const bool* return_as_stream);
|
| Response GetCategories(DevToolsCommandId command);
|
| Response RequestMemoryDump(DevToolsCommandId command_id);
|
| +
|
| bool did_initiate_recording() { return did_initiate_recording_; }
|
|
|
| private:
|
| @@ -57,7 +64,8 @@ class TracingHandler {
|
|
|
| void SetupTimer(double usage_reporting_interval);
|
|
|
| - void DisableRecording(bool abort);
|
| + void DisableRecording(
|
| + const scoped_refptr<TracingController::TraceDataSink>& trace_data_sink);
|
|
|
| bool IsRecording() const;
|
|
|
| @@ -66,6 +74,7 @@ class TracingHandler {
|
|
|
| scoped_ptr<Client> client_;
|
| bool did_initiate_recording_;
|
| + DevToolsIOContext* io_context_;
|
| base::WeakPtrFactory<TracingHandler> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TracingHandler);
|
|
|