Index: content/browser/devtools/render_view_devtools_agent_host.cc |
diff --git a/content/browser/devtools/render_view_devtools_agent_host.cc b/content/browser/devtools/render_view_devtools_agent_host.cc |
index e6982e32335e49abedbd57982cdf814b84d55697..9562f471082e6c377753ff7f3b443499ed8d4289 100644 |
--- a/content/browser/devtools/render_view_devtools_agent_host.cc |
+++ b/content/browser/devtools/render_view_devtools_agent_host.cc |
@@ -186,8 +186,9 @@ void RenderViewDevToolsAgentHost::DispatchProtocolMessage( |
void RenderViewDevToolsAgentHost::SendMessageToAgent(IPC::Message* msg) { |
if (!render_view_host_) |
return; |
- msg->set_routing_id(render_view_host_->GetRoutingID()); |
- render_view_host_->Send(msg); |
+ RenderFrameHost* main_frame_host = render_view_host_->GetMainFrame(); |
+ msg->set_routing_id(main_frame_host->GetRoutingID()); |
+ main_frame_host->Send(msg); |
} |
void RenderViewDevToolsAgentHost::OnClientAttached() { |
@@ -334,11 +335,11 @@ void RenderViewDevToolsAgentHost::RenderProcessGone( |
bool RenderViewDevToolsAgentHost::OnMessageReceived( |
const IPC::Message& message, |
RenderFrameHost* render_frame_host) { |
- return DispatchIPCMessage(message); |
-} |
- |
-bool RenderViewDevToolsAgentHost::OnMessageReceived( |
- const IPC::Message& message) { |
+ if (!render_view_host_) |
+ return false; |
+ if (render_frame_host != render_view_host_->GetMainFrame()) { |
+ return false; |
+ } |
return DispatchIPCMessage(message); |
} |