Detach old frame on WebFrame::swap.

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 5beb236fb01e24e24536d64345cf2d6ab14b078b..62ec814b928087729ab6b7d308e325ebabc884c6 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -125,6 +125,7 @@
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebColorSuggestion.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
+#include "third_party/WebKit/public/web/WebFrameClient.h"

[dcheng, 2015/06/01 21:15:54]

You shouldn't need this include, since it should already be in the header.

[lfg, 2015/06/01 21:34:19]

Done.

 #include "third_party/WebKit/public/web/WebFrameWidget.h"
 #include "third_party/WebKit/public/web/WebGlyphCache.h"
 #include "third_party/WebKit/public/web/WebKit.h"
@@ -692,7 +693,8 @@ RenderFrameImpl::~RenderFrameImpl() {
     if (render_frame_proxy_) {
       // The following method calls back into this object and clears
       // |render_frame_proxy_|.
-      render_frame_proxy_->frameDetached();
+      render_frame_proxy_->frameDetached(
+          blink::WebRemoteFrameClient::DetachType::Remove);
     }
 
     // Ensure the RenderView doesn't point to this object, once it is destroyed.
@@ -2120,6 +2122,12 @@ void RenderFrameImpl::didDisownOpener(blink::WebLocalFrame* frame) {
 }
 
 void RenderFrameImpl::frameDetached(blink::WebFrame* frame) {
+  frameDetached(frame, blink::WebFrameClient::DetachType::Remove);
+}
+
+void RenderFrameImpl::frameDetached(
+    blink::WebFrame* frame,
+    blink::WebFrameClient::DetachType type) {
   // NOTE: This function is called on the frame that is being detached and not
   // the parent frame.  This is different from createChildFrame() which is
   // called on the parent frame.
@@ -2130,7 +2138,8 @@ void RenderFrameImpl::frameDetached(blink::WebFrame* frame) {
   FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(),
                     FrameDetached(frame));
 
-  Send(new FrameHostMsg_Detach(routing_id_));
+  if (type == blink::WebFrameClient::DetachType::Remove)
+    Send(new FrameHostMsg_Detach(routing_id_));
 
   // The |is_detaching_| flag disables Send(). FrameHostMsg_Detach must be
   // sent before setting |is_detaching_| to true.
@@ -2150,7 +2159,9 @@ void RenderFrameImpl::frameDetached(blink::WebFrame* frame) {
             switches::kSitePerProcess) && render_widget_) {
       render_widget_->UnregisterRenderFrame(this);
     }
-    frame->parent()->removeChild(frame);
+
+    if (type == blink::WebFrameClient::DetachType::Remove)
+      frame->parent()->removeChild(frame);
   }
 
   // |frame| is invalid after here.  Be sure to clear frame_ as well, since this