Ignore DevTools messages from the old inspected RVH after navigation

content/renderer/devtools/devtools_agent.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/renderer/devtools/devtools_agent.h"
 
 #include <map>
 
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
@@ skipping 58 matching lines @@
  private:
   base::MessageLoop* message_loop_;
 };
 
 typedef std::map<int, DevToolsAgent*> IdToAgentMap;
 base::LazyInstance<IdToAgentMap>::Leaky
     g_agent_for_routing_id = LAZY_INSTANCE_INITIALIZER;
 
 } //  namespace
 
-DevToolsAgent::DevToolsAgent(RenderViewImpl* render_view)
-    : RenderViewObserver(render_view),
+DevToolsAgent::DevToolsAgent(RenderFrame* main_render_frame)
+    : RenderFrameObserver(main_render_frame),
       is_attached_(false),
       is_devtools_client_(false),
       gpu_route_id_(MSG_ROUTING_NONE),
-      paused_in_mouse_move_(false) {
+      paused_in_mouse_move_(false),
+      main_render_frame_(main_render_frame) {
   g_agent_for_routing_id.Get()[routing_id()] = this;
 
-  render_view->webview()->setDevToolsAgentClient(this);
+  main_render_frame_->GetRenderView()->GetWebView()->setDevToolsAgentClient(
+      this);
 }
 
 DevToolsAgent::~DevToolsAgent() {
   g_agent_for_routing_id.Get().erase(routing_id());
   resetTraceEventCallback();
 }
 
 // Called on the Renderer thread.
 bool DevToolsAgent::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
@@ skipping 47 matching lines @@
     const blink::WebString& state) {
   Send(new DevToolsHostMsg_SaveAgentRuntimeState(routing_id(), state.utf8()));
 }
 
 blink::WebDevToolsAgentClient::WebKitClientMessageLoop*
     DevToolsAgent::createClientMessageLoop() {
   return new WebKitClientMessageLoopImpl();
 }
 
 void DevToolsAgent::willEnterDebugLoop() {
-  RenderViewImpl* impl = static_cast<RenderViewImpl*>(render_view());
+  RenderViewImpl* impl =
+      static_cast<RenderViewImpl*>(main_render_frame_->GetRenderView());

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

Introduce GetRenderView?

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

Done.

   paused_in_mouse_move_ = impl->SendAckForMouseMoveFromDebugger();
 }
 
 void DevToolsAgent::didExitDebugLoop() {
-  RenderViewImpl* impl = static_cast<RenderViewImpl*>(render_view());
+  RenderViewImpl* impl =
+      static_cast<RenderViewImpl*>(main_render_frame_->GetRenderView());
   if (paused_in_mouse_move_) {
     impl->IgnoreAckForMouseMoveFromDebugger();
     paused_in_mouse_move_ = false;
   }
 }
 
 void DevToolsAgent::resetTraceEventCallback()
 {
   TraceLog::GetInstance()->SetEventCallbackDisabled();
   base::subtle::NoBarrier_Store(&event_callback_, 0);
@@ skipping 80 matching lines @@
     const GpuTaskInfo& task = tasks[i];
     WebDevToolsAgent::GPUEvent event(
         task.timestamp, task.phase, task.foreign, task.gpu_memory_used_bytes);
     event.limitGPUMemoryBytes = task.gpu_memory_limit_bytes;
     web_agent->processGPUEvent(event);
   }
 }
 
 void DevToolsAgent::enableDeviceEmulation(
     const blink::WebDeviceEmulationParams& params) {
-  RenderViewImpl* impl = static_cast<RenderViewImpl*>(render_view());
+  RenderViewImpl* impl =
+      static_cast<RenderViewImpl*>(main_render_frame_->GetRenderView());
   impl->EnableScreenMetricsEmulation(params);
 }
 
 void DevToolsAgent::disableDeviceEmulation() {
-  RenderViewImpl* impl = static_cast<RenderViewImpl*>(render_view());
+  RenderViewImpl* impl =
+      static_cast<RenderViewImpl*>(main_render_frame_->GetRenderView());
   impl->DisableScreenMetricsEmulation();
 }
 
 // static
 DevToolsAgent* DevToolsAgent::FromRoutingId(int routing_id) {
   IdToAgentMap::iterator it = g_agent_for_routing_id.Get().find(routing_id);
   if (it != g_agent_for_routing_id.Get().end()) {
     return it->second;
   }
   return NULL;
@@ skipping 37 matching lines @@
   WebDevToolsAgent* web_agent = GetWebAgent();
   if (web_agent) {
     web_agent->attach(WebString::fromUTF8(host_id));
     web_agent->inspectElementAt(WebPoint(x, y));
     is_attached_ = true;
   }
 }
 
 void DevToolsAgent::OnAddMessageToConsole(ConsoleMessageLevel level,
                                           const std::string& message) {
-  WebView* web_view = render_view()->GetWebView();
+  WebView* web_view = main_render_frame_->GetRenderView()->GetWebView();
   if (!web_view)
     return;
 
   WebFrame* main_frame = web_view->mainFrame();
   if (!main_frame)
     return;
 
   WebConsoleMessage::Level target_level = WebConsoleMessage::LevelLog;
   switch (level) {
     case CONSOLE_MESSAGE_LEVEL_DEBUG:
@@ skipping 17 matching lines @@
   WebDevToolsAgent* web_agent = GetWebAgent();
   if (web_agent)
     web_agent->continueProgram();
 }
 
 void DevToolsAgent::OnSetupDevToolsClient() {
   // We only want to register once per render view.
   if (is_devtools_client_)
     return;
   is_devtools_client_ = true;
-  new DevToolsClient(static_cast<RenderViewImpl*>(render_view()));
+  new DevToolsClient(main_render_frame_);
 }
 
 WebDevToolsAgent* DevToolsAgent::GetWebAgent() {
-  WebView* web_view = render_view()->GetWebView();
+  WebView* web_view = main_render_frame_->GetRenderView()->GetWebView();
   if (!web_view)
     return NULL;
   return web_view->devToolsAgent();
 }
 
 bool DevToolsAgent::IsAttached() {
   return is_attached_;
 }
 
 }  // namespace content