Ignore DevTools messages from the old inspected RVH after navigation

content/browser/devtools/render_view_devtools_agent_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/devtools/render_view_devtools_agent_host.h"
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/child_process_security_policy_impl.h"
@@ skipping 168 matching lines @@
       return;
     }
   }
 
   IPCDevToolsAgentHost::DispatchProtocolMessage(message);
 }
 
 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() {
   if (!render_view_host_)
     return;
 
   InnerOnClientAttached();
 
   // TODO(kaznacheev): Move this call back to DevToolsManager when
   // extensions::ProcessManager no longer relies on this notification.
@@ skipping 126 matching lines @@
       RenderViewCrashed();
       break;
     default:
       break;
   }
 }
 
 bool RenderViewDevToolsAgentHost::OnMessageReceived(
     const IPC::Message& message,
     RenderFrameHost* render_frame_host) {
+  if (!render_view_host_)
+    return false;
+  if (render_frame_host != render_view_host_->GetMainFrame()) {

[pfeldman, 2014/11/24 13:31:19]

Should we migrate this to render_frame_host_ ?

[yurys, 2014/11/24 14:08:54]

Let's do this in a separate change since there is some RVH specific logic in the
code.

+    return false;
+  }
   return DispatchIPCMessage(message);
 }
 
-bool RenderViewDevToolsAgentHost::OnMessageReceived(
-    const IPC::Message& message) {
-  return DispatchIPCMessage(message);
-}
-
 void RenderViewDevToolsAgentHost::DidAttachInterstitialPage() {
   page_handler_->DidAttachInterstitialPage();
 
   if (!render_view_host_)
     return;
   // The rvh set in AboutToNavigateRenderFrame turned out to be interstitial.
   // Connect back to the real one.
   WebContents* web_contents =
     WebContents::FromRenderViewHost(render_view_host_);
   if (!web_contents)
@@ skipping 90 matching lines @@
 bool RenderViewDevToolsAgentHost::Close() {
   if (render_view_host_) {
     render_view_host_->ClosePage();
     return true;
   }
   return false;
 }
 
 void RenderViewDevToolsAgentHost::ConnectRenderViewHost(RenderViewHost* rvh) {
   SetRenderViewHost(rvh);
-  if (IsAttached())
+  if (IsAttached()) {

[pfeldman, 2014/11/24 13:31:19]

no need

[yurys, 2014/11/24 14:08:54]

Done.

     Reattach(state_);
+  }
 }
 
 void RenderViewDevToolsAgentHost::DisconnectRenderViewHost() {
   ClientDetachedFromRenderer();
   ClearRenderViewHost();
 }
 
 void RenderViewDevToolsAgentHost::RenderViewCrashed() {
   inspector_handler_->TargetCrashed();
 }
@@ skipping 47 matching lines @@
 }
 
 void RenderViewDevToolsAgentHost::DispatchOnInspectorFrontend(
     const std::string& message) {
   if (!IsAttached() || !render_view_host_)
     return;
   SendMessageToClient(message);
 }
 
 }  // namespace content