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 94 matching lines @@
     RenderViewHost* pending,
     RenderViewHost* current) {
   WebContents* web_contents = WebContents::FromRenderViewHost(pending);
   RenderViewDevToolsAgentHost* agent_host = FindAgentHost(web_contents);
   if (!agent_host)
     return;
   agent_host->DisconnectRenderViewHost();
   agent_host->ConnectRenderViewHost(current);
 }
 
+// static
+bool RenderViewDevToolsAgentHost::DispatchIPCMessage(
+    RenderViewHost* source,
+    const IPC::Message& message) {
+  if (g_instances == NULL)
+    return false;
+  RenderViewDevToolsAgentHost* agent_host = nullptr;
+  for (Instances::iterator it = g_instances.Get().begin();
+       it != g_instances.Get().end(); ++it) {
+    if (source == (*it)->render_view_host_) {
+      agent_host = *it;
+      break;
+    }
+  }
+  return agent_host && agent_host->DispatchIPCMessage(message);
+}
+
 RenderViewDevToolsAgentHost::RenderViewDevToolsAgentHost(RenderViewHost* rvh)
     : render_view_host_(NULL),
       dom_handler_(new devtools::dom::DOMHandler()),
       input_handler_(new devtools::input::InputHandler()),
       network_handler_(new devtools::network::NetworkHandler()),
       page_handler_(new devtools::page::PageHandler()),
       power_handler_(new devtools::power::PowerHandler()),
       tracing_handler_(new devtools::tracing::TracingHandler(
           devtools::tracing::TracingHandler::Renderer)),
       handler_impl_(new DevToolsProtocolHandlerImpl()),
@@ skipping 197 matching lines @@
 #if defined(OS_ANDROID)
     case base::TERMINATION_STATUS_OOM_PROTECTED:
 #endif
       RenderViewCrashed();
       break;
     default:
       break;
   }
 }
 
-bool RenderViewDevToolsAgentHost::OnMessageReceived(

[Charlie Reis, 2014/11/20 23:11:10]

Can all of your messages go through here instead?  Then you can check whether
render_frame_host->GetRenderViewHost() is the RVH you expect.

[yurys, 2014/11/21 08:14:14]

How can we force all messages go this path and not the one below? I see that all
of the messages that are actually dispatched (i.e. DispatchIPCMessage returns
true) go through the method below which doesn't accept render_frame_host

[Charlie Reis, 2014/11/22 00:38:17]

I think they have to be sent through RenderFrame{Host} rather than
RenderView{Host}.  See these lines in WebContentsImpl::OnMessageReceived:

  WebContentsObserver* observer;
  if (render_frame_host) {
    while ((observer = it.GetNext()) != NULL)
      if (observer->OnMessageReceived(message, render_frame_host))
        return true;
  } else {
    while ((observer = it.GetNext()) != NULL)
      if (observer->OnMessageReceived(message))
        return true;
  }

That includes any messages forwarded to WebContents from RFH rather than from
RVH.  It will need to include all messages eventually, as RVH goes away.

[yurys, 2014/11/24 13:19:30]

Done.

-    const IPC::Message& message,
-    RenderFrameHost* render_frame_host) {
-  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 162 matching lines @@
 }
 
 void RenderViewDevToolsAgentHost::DispatchOnInspectorFrontend(
     const std::string& message) {
   if (!IsAttached() || !render_view_host_)
     return;
   SendMessageToClient(message);
 }
 
 }  // namespace content