[DevTools] Close DevTools when corresponding frame is deleted.

This is an attempt to fix a number of crashes, basically reverting https://crrev.com/a83483fb2fd36c1b5674de9f2ce716ef613367b0. BUG=461774,481484,496948,462343,463738,497593,484954 Review URL: https://codereview.chromium.org/1170443005 Cr-Commit-Position: refs/heads/master@{#333323}
hylschwy · Jun 8, 2015 · 0828cb6 · 0828cb6
1 parent 8d457fb
commit 0828cb6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/content/browser/devtools/render_frame_devtools_agent_host.cc b/content/browser/devtools/render_frame_devtools_agent_host.cc
@@ -494,6 +494,10 @@ void RenderFrameDevToolsAgentHost::FrameDeleted(RenderFrameHost* rfh) {
     DestroyOnRenderFrameGone();  // |this| may be deleted at this point.
 }
 
+void RenderFrameDevToolsAgentHost::RenderFrameDeleted(RenderFrameHost* rfh) {
+  FrameDeleted(rfh);
+}
+
 void RenderFrameDevToolsAgentHost::DestroyOnRenderFrameGone() {
   DCHECK(current_);
   scoped_refptr<RenderFrameDevToolsAgentHost> protect(this);

diff --git a/content/browser/devtools/render_frame_devtools_agent_host.h b/content/browser/devtools/render_frame_devtools_agent_host.h
@@ -89,6 +89,7 @@ class CONTENT_EXPORT RenderFrameDevToolsAgentHost
   void RenderFrameHostChanged(RenderFrameHost* old_host,
                               RenderFrameHost* new_host) override;
   void FrameDeleted(RenderFrameHost* rfh) override;
+  void RenderFrameDeleted(RenderFrameHost* rfh) override;
   void RenderProcessGone(base::TerminationStatus status) override;
   bool OnMessageReceived(const IPC::Message& message,
                          RenderFrameHost* render_frame_host) override;