Index: content/renderer/devtools/devtools_agent_filter.cc |
diff --git a/content/renderer/devtools/devtools_agent_filter.cc b/content/renderer/devtools/devtools_agent_filter.cc |
index b0a60f005141d9c750737434a0c8a60fb6eeb9fd..f070c1fb28015648f6225d06c01dbd98a791473c 100644 |
--- a/content/renderer/devtools/devtools_agent_filter.cc |
+++ b/content/renderer/devtools/devtools_agent_filter.cc |
@@ -41,21 +41,18 @@ class MessageImpl : public WebDevToolsAgent::MessageDescriptor { |
} // namespace |
DevToolsAgentFilter::DevToolsAgentFilter() |
- : message_handled_(false), |
- render_thread_loop_(base::MessageLoop::current()), |
+ : render_thread_loop_(base::MessageLoop::current()), |
io_message_loop_proxy_(ChildProcess::current()->io_message_loop_proxy()), |
current_routing_id_(0) {} |
bool DevToolsAgentFilter::OnMessageReceived(const IPC::Message& message) { |
// Dispatch debugger commands directly from IO. |
- message_handled_ = true; |
current_routing_id_ = message.routing_id(); |
IPC_BEGIN_MESSAGE_MAP(DevToolsAgentFilter, message) |
IPC_MESSAGE_HANDLER(DevToolsAgentMsg_DispatchOnInspectorBackend, |
OnDispatchOnInspectorBackend) |
- IPC_MESSAGE_UNHANDLED(message_handled_ = false) |
IPC_END_MESSAGE_MAP() |
- return message_handled_; |
+ return false; |
} |
DevToolsAgentFilter::~DevToolsAgentFilter() {} |
@@ -64,19 +61,15 @@ void DevToolsAgentFilter::OnDispatchOnInspectorBackend( |
const std::string& message) { |
if (embedded_worker_routes_.find(current_routing_id_) != |
embedded_worker_routes_.end()) { |
- message_handled_ = false; |
return; |
} |
- if (!WebDevToolsAgent::shouldInterruptForMessage( |
+ |
+ if (WebDevToolsAgent::shouldInterruptForMessage( |
WebString::fromUTF8(message))) { |
- message_handled_ = false; |
- return; |
+ WebDevToolsAgent::interruptAndDispatch( |
+ new MessageImpl(message, current_routing_id_)); |
} |
- WebDevToolsAgent::interruptAndDispatch( |
- new MessageImpl(message, current_routing_id_)); |
- render_thread_loop_->PostTask( |
- FROM_HERE, base::Bind(&WebDevToolsAgent::processPendingMessages)); |
} |
void DevToolsAgentFilter::AddEmbeddedWorkerRouteOnMainThread(int32 routing_id) { |