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

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

Issue 1437993003: Revert of [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 side-by-side diff with in-line comments
Download patch
Index: content/browser/devtools/worker_devtools_agent_host.cc
diff --git a/content/browser/devtools/worker_devtools_agent_host.cc b/content/browser/devtools/worker_devtools_agent_host.cc
index d7be60a80c58a809014fd505e67761c9af1f040d..32cd668e3d68e34f498aa986d4d18cdaa5f304af 100644
--- a/content/browser/devtools/worker_devtools_agent_host.cc
+++ b/content/browser/devtools/worker_devtools_agent_host.cc
@@ -21,8 +21,7 @@
AttachToWorker();
}
if (RenderProcessHost* host = RenderProcessHost::FromID(worker_id_.first))
- host->Send(
- new DevToolsAgentMsg_Attach(worker_id_.second, GetId(), session_id()));
+ host->Send(new DevToolsAgentMsg_Attach(worker_id_.second, GetId()));
OnAttachedStateChanged(true);
DevToolsAgentHostImpl::NotifyCallbacks(this, true);
}
@@ -46,12 +45,12 @@
return true;
int call_id;
- if (protocol_handler_->HandleOptionalMessage(session_id(), message, &call_id))
+ if (protocol_handler_->HandleOptionalMessage(message, &call_id))
return true;
if (RenderProcessHost* host = RenderProcessHost::FromID(worker_id_.first)) {
host->Send(new DevToolsAgentMsg_DispatchOnInspectorBackend(
- worker_id_.second, session_id(), message));
+ worker_id_.second, message));
}
return true;
}
@@ -84,8 +83,7 @@
AttachToWorker();
if (RenderProcessHost* host = RenderProcessHost::FromID(worker_id_.first)) {
host->Send(new DevToolsAgentMsg_Reattach(
- worker_id_.second, GetId(), session_id(),
- chunk_processor_.state_cookie()));
+ worker_id_.second, GetId(), chunk_processor_.state_cookie()));
}
OnAttachedStateChanged(true);
}
@@ -103,7 +101,10 @@
if (state_ == WORKER_INSPECTED) {
DCHECK(IsAttached());
// Client host is debugging this worker agent host.
- devtools::inspector::Client inspector(this);
+ base::Callback<void(const std::string&)> raw_message_callback(
+ base::Bind(&WorkerDevToolsAgentHost::SendMessageToClient,
+ base::Unretained(this)));
+ devtools::inspector::Client inspector(raw_message_callback);
inspector.TargetCrashed(
devtools::inspector::TargetCrashedParams::Create());
DetachFromWorker();
@@ -116,10 +117,15 @@
return state_ == WORKER_TERMINATED;
}
-WorkerDevToolsAgentHost::WorkerDevToolsAgentHost(WorkerId worker_id)
- : protocol_handler_(new DevToolsProtocolHandler(this)),
- chunk_processor_(base::Bind(&WorkerDevToolsAgentHost::SendMessageToClient,
- base::Unretained(this))),
+WorkerDevToolsAgentHost::WorkerDevToolsAgentHost(
+ WorkerId worker_id)
+ : protocol_handler_(new DevToolsProtocolHandler(
+ this,
+ base::Bind(&WorkerDevToolsAgentHost::SendMessageToClient,
+ base::Unretained(this)))),
+ chunk_processor_(
+ base::Bind(&WorkerDevToolsAgentHost::SendMessageToClient,
+ base::Unretained(this))),
state_(WORKER_UNINSPECTED),
worker_id_(worker_id) {
WorkerCreated();
« no previous file with comments | « content/browser/devtools/render_frame_devtools_agent_host.cc ('k') | content/child/shared_worker_devtools_agent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698