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

Side by Side Diff: content/browser/devtools/protocol/tracing_handler.h

Issue 1408363004: [DevTools] Filter any messages from previous sessions in DevToolsAgentHostImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_DEVTOOLS_PROTOCOL_TRACING_HANDLER_H_ 5 #ifndef CONTENT_BROWSER_DEVTOOLS_PROTOCOL_TRACING_HANDLER_H_
6 #define CONTENT_BROWSER_DEVTOOLS_PROTOCOL_TRACING_HANDLER_H_ 6 #define CONTENT_BROWSER_DEVTOOLS_PROTOCOL_TRACING_HANDLER_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 23 matching lines...) Expand all
34 virtual ~TracingHandler(); 34 virtual ~TracingHandler();
35 35
36 void SetClient(scoped_ptr<Client> client); 36 void SetClient(scoped_ptr<Client> client);
37 void Detached(); 37 void Detached();
38 38
39 void OnTraceDataCollected(const std::string& trace_fragment); 39 void OnTraceDataCollected(const std::string& trace_fragment);
40 void OnTraceComplete(); 40 void OnTraceComplete();
41 void OnTraceToStreamComplete(const std::string& stream_handle); 41 void OnTraceToStreamComplete(const std::string& stream_handle);
42 42
43 // Protocol methods. 43 // Protocol methods.
44 Response Start(DevToolsCommandId command_id, 44 Response Start(int session_id,
45 DevToolsCommandId command_id,
45 const std::string* categories, 46 const std::string* categories,
46 const std::string* options, 47 const std::string* options,
47 const double* buffer_usage_reporting_interval, 48 const double* buffer_usage_reporting_interval,
48 const std::string* transfer_mode); 49 const std::string* transfer_mode);
49 Response End(DevToolsCommandId command_id); 50 Response End(int session_id, DevToolsCommandId command_id);
50 Response GetCategories(DevToolsCommandId command); 51 Response GetCategories(int session_id, DevToolsCommandId command);
51 Response RequestMemoryDump(DevToolsCommandId command_id); 52 Response RequestMemoryDump(int session_id, DevToolsCommandId command_id);
52 53
53 bool did_initiate_recording() { return did_initiate_recording_; } 54 bool did_initiate_recording() { return did_initiate_recording_; }
54 55
55 private: 56 private:
56 void OnRecordingEnabled(DevToolsCommandId command_id); 57 void OnRecordingEnabled(int session_id, DevToolsCommandId command_id);
57 void OnBufferUsage(float percent_full, size_t approximate_event_count); 58 void OnBufferUsage(float percent_full, size_t approximate_event_count);
58 void OnCategoriesReceived(DevToolsCommandId command_id, 59 void OnCategoriesReceived(int session_id,
60 DevToolsCommandId command_id,
59 const std::set<std::string>& category_set); 61 const std::set<std::string>& category_set);
60 void OnMemoryDumpFinished(DevToolsCommandId command_id, 62 void OnMemoryDumpFinished(int session_id,
63 DevToolsCommandId command_id,
61 uint64 dump_guid, 64 uint64 dump_guid,
62 bool success); 65 bool success);
63 66
64 void SetupTimer(double usage_reporting_interval); 67 void SetupTimer(double usage_reporting_interval);
65 void DisableRecording( 68 void DisableRecording(
66 const scoped_refptr<TracingController::TraceDataSink>& trace_data_sink); 69 const scoped_refptr<TracingController::TraceDataSink>& trace_data_sink);
67 bool IsRecording() const; 70 bool IsRecording() const;
68 static bool IsStartupTracingActive(); 71 static bool IsStartupTracingActive();
69 72
70 scoped_ptr<base::Timer> buffer_usage_poll_timer_; 73 scoped_ptr<base::Timer> buffer_usage_poll_timer_;
71 Target target_; 74 Target target_;
72 75
73 scoped_ptr<Client> client_; 76 scoped_ptr<Client> client_;
74 DevToolsIOContext* io_context_; 77 DevToolsIOContext* io_context_;
75 bool did_initiate_recording_; 78 bool did_initiate_recording_;
76 bool return_as_stream_; 79 bool return_as_stream_;
77 base::WeakPtrFactory<TracingHandler> weak_factory_; 80 base::WeakPtrFactory<TracingHandler> weak_factory_;
78 81
79 DISALLOW_COPY_AND_ASSIGN(TracingHandler); 82 DISALLOW_COPY_AND_ASSIGN(TracingHandler);
80 }; 83 };
81 84
82 } // namespace tracing 85 } // namespace tracing
83 } // namespace devtools 86 } // namespace devtools
84 } // namespace content 87 } // namespace content
85 88
86 #endif // CONTENT_BROWSER_DEVTOOLS_PROTOCOL_TRACING_HANDLER_H_ 89 #endif // CONTENT_BROWSER_DEVTOOLS_PROTOCOL_TRACING_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698