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

Unified Diff: content/browser/devtools/render_frame_devtools_agent_host.cc

Issue 1307073002: DevTools: provide an option to return traces as streams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/devtools/render_frame_devtools_agent_host.cc
diff --git a/content/browser/devtools/render_frame_devtools_agent_host.cc b/content/browser/devtools/render_frame_devtools_agent_host.cc
index 627d32db44b255d4ce09313856ff893871b95304..759d41b0e4c620bae5e8eb982335ed843339a11d 100644
--- a/content/browser/devtools/render_frame_devtools_agent_host.cc
+++ b/content/browser/devtools/render_frame_devtools_agent_host.cc
@@ -14,6 +14,7 @@
#include "content/browser/devtools/protocol/emulation_handler.h"
#include "content/browser/devtools/protocol/input_handler.h"
#include "content/browser/devtools/protocol/inspector_handler.h"
+#include "content/browser/devtools/protocol/io_handler.h"
#include "content/browser/devtools/protocol/network_handler.h"
#include "content/browser/devtools/protocol/page_handler.h"
#include "content/browser/devtools/protocol/power_handler.h"
@@ -293,6 +294,7 @@ RenderFrameDevToolsAgentHost::RenderFrameDevToolsAgentHost(
: dom_handler_(new devtools::dom::DOMHandler()),
input_handler_(new devtools::input::InputHandler()),
inspector_handler_(new devtools::inspector::InspectorHandler()),
+ io_handler_(new devtools::io::IOHandler(GetIOContext())),
network_handler_(new devtools::network::NetworkHandler()),
page_handler_(nullptr),
power_handler_(new devtools::power::PowerHandler()),
@@ -300,7 +302,8 @@ RenderFrameDevToolsAgentHost::RenderFrameDevToolsAgentHost(
service_worker_handler_(
new devtools::service_worker::ServiceWorkerHandler()),
tracing_handler_(new devtools::tracing::TracingHandler(
- devtools::tracing::TracingHandler::Renderer)),
+ devtools::tracing::TracingHandler::Renderer,
+ GetIOContext())),
emulation_handler_(nullptr),
frame_trace_recorder_(nullptr),
protocol_handler_(new DevToolsProtocolHandler(
@@ -316,6 +319,7 @@ RenderFrameDevToolsAgentHost::RenderFrameDevToolsAgentHost(
dispatcher->SetPowerHandler(power_handler_.get());
dispatcher->SetServiceWorkerHandler(service_worker_handler_.get());
dispatcher->SetTracingHandler(tracing_handler_.get());
+ dispatcher->SetIOHandler(io_handler_.get());
dgozman 2015/08/24 20:45:44 nit: let's try to be alphabetical when possible.
if (!host->GetParent()) {
security_handler_.reset(new devtools::security::SecurityHandler());

Powered by Google App Engine
This is Rietveld 408576698